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