Backed out changeset 79d2db9a2a2c (bug 1042398) for build bustage on a CLOSED TREE