Thanks Tim Graham for the review. Backport of 1b823b8f182e8f31b8c9db281311ef718299eda7 from master
Regression in 69b7d4b116e3b70b250c77829e11038d5d55c2a8.