This reverts commit 8f10e1b0.

There's a small chance this will create an observable behaviour change,
and that doesn't seem worthwhile in a back-branch.