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