This reverts commit 54c71521. Bug: None Test: make checkbuild Change-Id: Ica6a4f7ecadfcc854160a60a5db1b44ae3b6c821