This reverts commit 69c7562f. Test: make checkbuild Change-Id: Ie443029398c01b45e0a0317a8074808b064f35d4