Mac production build fix attempt after r190155.