Regression in 268a646353c6fa9e5fc3730e13b386ddabb018ef. Backport of 82741605206382d0afd879c4bce174ef3d6e8aea from master