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