This reverts commit 284610ed. Reason for revert: broke mac build Change-Id: I7288e6008e052b58ca2c67d83157e8313f7fa6f3