This reverts commit fa930165. Reason for revert: Unknown build failure. Change-Id: I0e29c414274568c70db361675014383f758acbc0