Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com> (cherry picked from commit 600eecbac6)
600eecbac6