Oops: restore Python 2 support