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