am 45200485: am 89996c4b: Merge "Undo mac fix to fix windows, fix mac differently."

* commit '4520048535a980203125d830db3bba61222ac324':
  Undo mac fix to fix windows, fix mac differently.