Restored python 2.5 support