This reverts commit 4135148b.

It would seem that we need to discuss more about this, before.
Back to the ml.
(cherry picked from commit 21116876)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>