This reverts commit a41a8877. Reason for revert: Broke Darwin builds Change-Id: I4371d735ffea51f7c349b4d223bc91c103163015