The fix is in neither, but in pickle.py where a loop over sys.modules.items()
could modify sys.modules, occasionally.