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