Backed out changeset 630b25ba7f69 (bug 910429) for build bustage on a CLOSED TREE.