Backed out changeset 9877aca65ef5 (bug 1038620) for causing Test Bustage on a CLOSED TREE