bpo-46110: Restore commit e9898bf153d26059261ffef11f7643ae991e2a4c

This restores commit e9898bf153d26059261ffef11f7643ae991e2a4c .
5 files changed