Backed out changeset d2e790e8bc8e (bug 1030945)
Backed out changeset 1437c48ae58d (bug 1030945) for introducing a new hazard, CLOSED TREE