Remove old hack from when we used 2to3 for Python 3