Revert an earlier attempt (r76810) to fix the intermittent test_capi failures fixed in r78172.
Revert an earlier attempt (r76810) to fix the intermittent test_capi failures fixed in r78172.

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator