Fix build bustage for bug 868405, CLOSED TREE