Undo mac fix to fix windows, fix mac differently.

Change-Id: I7d1ee439d25e17c31c0be448e67a90a0f626ff42
2 files changed