Revert "Merge pull request #294 from Kronuz/python3"

This reverts commit 0ac1d6622e52be65d8babe065efd851b9bbb0ac7, reversing
changes made to 5f26e7eadb1a2cdcb9b451c0749ba16489bd618a.

Clearly I didn't investigate this pull request enough. It does crazy things to diff.