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