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

Change-Id: Ia6443d12fc45d504d8dc6228468059f0931dd85c