Merge "Remove macOS-specific workaround."
am: e5be747906

Change-Id: I8a07a2e852b9003de35997cd5d3a7bb340a079db