Backout 6ee620315ad4 for causing test timeouts on a CLOSED TREE