Bug 996831 followup to fix silly gcc build bustage and reopen the CLOSED TREE