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

Debugging what I can for the brokenness introduced in 0.10.1