e05f0ba3b2
This reverts commit 7e6e824d5655026906b6515070aeb604d2ef3426. Fixes #7770 The change in #7623 needs to be revered; the raise-site added in #7632 is the correct one and the one in socketpool needs to be reverted. This is not affecting 8.0.x because #7623 was not back-ported to there before we realized it was not a full fix. Both #7770 and #7606 should be re-tested. I didn't test.