--- a/mercurial/localrepo.py	Mon Aug 25 18:35:39 2014 +0200
+++ b/mercurial/localrepo.py	Mon Aug 25 19:17:06 2014 +0200
@@ -180,12 +180,6 @@
     requirements = ['revlogv1']
     filtername = None
 
-    bundle2caps = {'HG2X': (),
-                   'b2x:listkeys': (),
-                   'b2x:pushkey': (),
-                   'b2x:changegroup': (),
-                  }
-
     # a list of (ui, featureset) functions.
     # only functions defined in module of enabled extensions are invoked
     featuresetupfuncs = set()
@@ -311,7 +305,7 @@
         # required by the tests (or some brave tester)
         if self.ui.configbool('experimental', 'bundle2-exp', False):
             caps = set(caps)
-            capsblob = bundle2.encodecaps(self.bundle2caps)
+            capsblob = bundle2.encodecaps(bundle2.capabilities)
             caps.add('bundle2-exp=' + urllib.quote(capsblob))
         return caps