Roll out r37391 as it appears to have broken 40+ regression tests.