--- a/hgext3rd/evolve/__init__.py	Tue Feb 28 14:28:54 2017 +0100
+++ b/hgext3rd/evolve/__init__.py	Tue Feb 28 14:29:36 2017 +0100
@@ -87,15 +87,9 @@
 from mercurial import util
 from mercurial import repair
 
-try:
-    from mercurial import obsolete
-    if not obsolete._enabled:
-        obsolete._enabled = True
-    from mercurial import wireproto
-    gboptslist = getattr(wireproto, 'gboptslist', None)
-    gboptsmap = getattr(wireproto, 'gboptsmap', None)
-except (ImportError, AttributeError):
-    gboptslist = gboptsmap = None
+from mercurial import obsolete
+if not obsolete._enabled:
+    obsolete._enabled = True
 
 # Flags for enabling optional parts of evolve
 commandopt = 'allnewcommands'
@@ -3684,7 +3678,7 @@
 
 @eh.uisetup
 def addgetbundleargs(self):
-    gboptsmap['evo_obscommon'] = 'nodes'
+    wireproto.gboptsmap['evo_obscommon'] = 'nodes'
 
 @eh.wrapfunction(exchange, '_pullbundle2extraprepare')
 def _addobscommontob2pull(orig, pullop, kwargs):