Restore compatibilty with Python 2.6