Merge "Remove macOS-specific workaround."