This reverts commit b5d0bf9b. The original commit is causing 10 test failures on multiple bots, reverting to get back to green.