Backed out changeset 523ef80786ad (bug 1032528) because of build failure on a CLOSED TREE