This reverts commit 9a966cbb. The mac build breaks. Change-Id: I045ece805d42050a14e67f0c8cb3d6f3755d79f4