This reverts commit 7bc57b8b7d. Practically speaking, this reverts the Python 3 changes, since they're broken.
7bc57b8b7d