Ref: #5090 Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 26e21d43b5402d0c20bd2222429629c164968668)