--- a/hgext3rd/topic/__init__.py	Wed Mar 30 22:25:17 2016 -0700
+++ b/hgext3rd/topic/__init__.py	Wed Mar 30 22:31:24 2016 -0700
@@ -17,7 +17,6 @@
 from mercurial.i18n import _
 from mercurial import (
     branchmap,
-    changegroup,
     cmdutil,
     commands,
     context,
@@ -91,10 +90,6 @@
     discovery.modsetup(ui)
     setupimportexport(ui)
 
-def cgapply(orig, repo, *args, **kwargs):
-    with topicmap.usetopicmap(repo):
-        return orig(repo, *args, **kwargs)
-
 def reposetup(ui, repo):
     orig = repo.__class__
     if not isinstance(repo, localrepo.localrepository):
@@ -343,6 +338,5 @@
 
 extensions.wrapfunction(cmdutil, 'buildcommittext', committextwrap)
 extensions.wrapfunction(merge, 'update', mergeupdatewrap)
-extensions.wrapfunction(changegroup.cg1unpacker, 'apply', cgapply)
 cmdutil.summaryhooks.add('topic', summaryhook)