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