Revert "Fix build error"

This reverts commit 0339522f33cacbbe4f12f8e617b860180b1f0859.

Change-Id: I4801b72aa51f7b5d0effec198e94f34025de6537