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