Merge "Another go at fixing the Mac build."