Revert Python 3 changes