Backing out r47521 for now. This has broken a number of tests.