Restore Py2.5 compatibility