Signed-off-by: Daniel Golle <daniel@makrotopia.org> (cherry picked from commit 63571cb56c)
63571cb56c