Revert "fix build errors"

This reverts commit 323bc5c8b5bc565eb4bf5baa8b62843b4294bc9f.

Change-Id: I184a6946f8f4e439ef9a8a901149081aea5d9d09