Revert compatibility with Python 3 to support 2.5