Revert "bpo-32107 - Better merge of #4494 (#4576)" (#4593)

This reverts commit 9522a218f7dff95c490ff359cc60e8c2af35f5c8.
3 files changed