Turns out this workaround works for other importers beside zipimporter, so remove the explicit check for that.  The worst that can happen is the workaround doesn't work for some obscure importer, in which case None is returned and the same bug occurs anyways.