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