Much better than having to mangle local fields Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>