Backed out changeset 10800c0df8b5 (bug 487070) for build bustage on a CLOSED TREE