Regression in 3079133c73f3b8b0e929673b06b62dce1f54be71. Backport of 0638b4e23dbabdcf7d7a6f2a2d5b95b980dece78 from main