Regression in 2162f0983de0dfe2178531638ce7ea56f54dd4e7. Backport of f315d0423a09dfe20dd4d4f6a0eb11fc8e45a665 from master