Backed out changeset 0064d8949f0c (bug 1102541) for build bustage on a CLOSED TREE