Regression in 456466d932830b096d39806e291fe23ec5ed38d5. Backport of 7fe9b6f6df16fa875fe360a1c7d0ac53fcf08a53 from main