Comment 4 for bug 1780827

Note that I'm getting hangs when running tests with py3.7 after this fix is applied. (I think the tests fail before reaching the hangs without the fix applied). It may be a separate issue. I'll provide more details shortly.