Backed out changeset 6dc60397b3a1 (bug 976530)
Backed out changeset bef8a33f2d8f (bug 976697) for bustage on a CLOSED TREE