This reverts commit 4135148ba02495d59c01e190843bf2cc647c7ef1.

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