Revert r215343.

This was contentious and needs invesigation.