This reverts commit fc895ba189. This is change is a feature and doesn't belong on the patch branch.
fc895ba189