Revert "Fix compiler warnings" - unbreak everything.

This reverts commit 2907359dce8591a99444ebb0b987faccfc373aae.