Regression in 967450a3bf. Backport of e3c852cbd6 from master
967450a3bf
e3c852cbd6
Backport of 967450a3bf from master