Revert r269528; this was not the right way to bring these changes in.