Migrating to Python 2.7. Some quick hacks to get functionality back so we have a starting point.