Revert "Fix some compile warnings"

Authored by elvisangelaccio on Mar 5 2018, 8:56 PM.