reverted a custom python2 fix to the original version