This reverts commit e50cfac2d3cbc00abd7d332eb47abb584ef5eac4.
This undid modifications made in f83d51d4
(cherry picked from commit 091552e8ad1738aaccb1e930d39fcb13df113114)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>