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