The changes for bpo-29585 eliminate the extra imports on macOS that caused the original test failure. This reverts commit 8a2150aa.
Attach a file by drag & drop or click to upload
