Merge "Attempt to fix macos build."