Restore Python 3 compatibility (previously untested)
Restore Python 2.5 compatibility