Revert "Fix build"

This reverts commit 4350a4e55492c13fd114b5e4c29be7e4b3de79f1.

Change-Id: I3c5712dfe40870e3958531824dd7a38ab0b27575