Python 3 compatibility restored