Regression in 456466d932830b096d39806e291fe23ec5ed38d5. Backport of 4884a87e022056eda10534c13d74e49b8cdda632 from main