Regression in 1d070d027c218285b66c0bde8079034b33a87f11. Backport of 4ab1f559e8d1264bcb20bb497988973194f5d8f2 from master