Restore Python 3 compatibility