fd1bbba8f8
This reverts commitf5ade96e06, reversing changes made to91d97d6c62. They were causing too much breakage for us.