Reverting "Python 3 Migration Improvements" Change