This reverts commit 72a0d218.

The reverted commit had a few issues so it was unanimously decided
to undo it. See the bpo issue for details.