Backed out changeset 039b15c9b84e (bug 979345) for build bustage on a CLOSED TREE