This is more correct and will be needed when the code is moved to
a later point.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>