Backed out changeset 263b6c86c1be (bug 980558) for build bustage on a CLOSED TREE