Regression in fdc936c9130cf4fb5d59869674b9a31cc79a7999. Backport of f434f5b84f7fcea9a76a551621ecce70786e2899 from master