Backout 393fbf5c28bf for test failures on a CLOSED TREE