Revert "Fix some compile warnings"
This reverts commit 533f050855a50212bba7be57a1590f9ce743e26d.
D10995 has not been approved.