This reverts commit 84ed7d06. This breaks the mac build. Change-Id: I90ea0872073135c8ff2089e05b8b16985ef95773