Revert commits 5685 to 5688 committed by mistake Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Changed paths: