Regression in dffa3e1992562ba60512d96d1eb5859ffff2ceb5. Backport of 0b013564ef0609d95b1d263626f2e15bccda1a50 from master