Revert "Merge pull request #168 from akatz/fix-deprecation-warnings"

This reverts commit ec5037d9564124260f1ae77ba2798332e0a10328, reversing
changes made to 9c051fe46560877bd16bac1cfcbde8822e681455.
Merge pull request #173 from github/revert-168

Revert "Merge pull request #168 from akatz/fix-deprecation-warnings"