Revert "fix build warnings"

This reverts commit b8034bf970864a18eb0c9e9d364a3fcb91e7ee19.