Revert "Better Python 3 support"

This reverts commit c37831264539398f8ad1ff94c1aa89900282e399.