Revert "Fix build"

This reverts commit 4ef94387d56e037c052f53344cfdadd8ddcbe9e1.
Fix build

Change-Id: Ia53ed08fe2a0f3cdbb3341caeb0c5a41e4e461cf