This reverts commit 31444400.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bba7b6fc)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>