This reverts commit 9e16580f. Reason for revert: Broke all the builds. Test: none Change-Id: If2b8a0a36d6e2a902c33a66b82b11f693d7f7139 (cherry picked from commit f4269d1a)