We just hit this same problem. I think this is exactly the right fix. I tested it locally in a venv. Unfortunately I don't have permission to push the fix to the repo. Also, PyPI is a version behind unstable.