Revert "Fix a few deprecation warnings"

This reverts commit 3408bd64b81e997c8f084b174df935d85f95bf40.

I pushed this without attempting to compile it....