Partial revert of commit 4149ee8ec0, better fix coming up. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
4149ee8ec0