Backed out changeset 59f193167901 (bug 1049758) for build bustage on a CLOSED TREE