Backed out changeset d42a36615c7e (bug 983204) for build bustage on an otherwise CLOSED TREE