Backed out changeset 1204d2bb361b (bug 870887) for build bustage on a CLOSED TREE.