Restore Python 2.6 support