Hopefully by Python 3.9 this will be fixed upstream, if not we will need to bump the version again. Fix #5523