Back out Python 3 fix that is broken by 2to3.