This reverts commit 362b9d78b4. Buildbots using python3.10 are running into errors from this change.
362b9d78b4