This reverts commit b2b84372b5.
Reason for revert: Causes build failures
Change-Id: I04f4a6e6d6082903056c296d543870dd165b6eea
This reverts commit b2b84372b5.
Reason for revert: Causes build failures
Change-Id: I04f4a6e6d6082903056c296d543870dd165b6eea