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