there are no Deprecation Warnings

This is practically a revert of commit 50fb1030b. I tested with Python 3.3 and 2.7.