Signed-off-by: Jo-Philipp Wich <jo@mein.io> (backported from commit c48d8f4a2c9a771c8c03a76eb1b554f62d57140b)