Backed out changeset 63e44c0641c3 (bug 925530) for build bustage on a CLOSED TREE