Add back Python 2.6 support