Revert "Fix deprecation warnings, maybe"

This reverts commit 8cded2fd16c6e05ca7da5cd525cc08d636e63c62.