Regression in 09ffc5c1212d4ced58b708cbbf3dfbfb77b782ca. Backport of 53aee470d5b35e2708864d5221d2b5655e10c091 from main