Restore py2 support.