This reverts commit f5ade96e06, reversing changes made to 91d97d6c62. They were causing too much breakage for us.
f5ade96e06
91d97d6c62