This reverts commit e6f58b6d4c. This is our third (3rd!) attempt to deploy stage 2 of this column rename.
e6f58b6d4c
2to3 -f future . -w