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