fixes regression since 80d44190 and 1a0370ad
this reverts the buggy changes in these 2 commits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>