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