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