diff -r 75ff093d2763 -r 17755dd8c509 mercurial/exchange.py
--- a/mercurial/exchange.py	Thu May 22 12:58:07 2014 -0700
+++ b/mercurial/exchange.py	Sat May 24 16:20:09 2014 -0700
@@ -208,9 +208,7 @@
 
     The only currently supported type of data is changegroup but this will
     evolve in the future."""
-    capsblob = urllib.unquote(pushop.remote.capable('bundle2-exp'))
-    caps = bundle2.decodecaps(capsblob)
-    bundler = bundle2.bundle20(pushop.ui, caps)
+    bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote))
     # create reply capability
     capsblob = bundle2.encodecaps(pushop.repo.bundle2caps)
     bundler.newpart('b2x:replycaps', data=capsblob)