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