Reverted (partially) patch r62667 to zipimport.c.
Reverted (partially) patch r62667 to zipimport.c.

test_pkgutil and test_zipimport are failing on the amd64-gentoo
buildbot due to a yet unknown change introduced by r62667. To find
out what is causing the failure, I am reverting partially r62667.

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