This reverts commit 9b2b17c1. Reason for revert: broke mac build Change-Id: I5f9b7dee61b6da527934acd73d96829abfeedb43