Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit e6a2cdbdab83f8eaefeec36ad668468ea374d471)