diff -r 0e330d7d9f53 -r ae53ecc47414 mercurial/httppeer.py
--- a/mercurial/httppeer.py	Mon Mar 28 17:16:00 2016 -0500
+++ b/mercurial/httppeer.py	Mon Mar 28 14:41:29 2016 -0700
@@ -20,7 +20,7 @@
 from .i18n import _
 from .node import nullid
 from . import (
-    changegroup,
+    bundle2,
     error,
     httpconnection,
     statichttprepo,
@@ -222,11 +222,11 @@
             # bundles.
             types = [""]
         for x in types:
-            if x in changegroup.bundletypes:
+            if x in bundle2.bundletypes:
                 type = x
                 break
 
-        tempname = changegroup.writebundle(self.ui, cg, None, type)
+        tempname = bundle2.writebundle(self.ui, cg, None, type)
         fp = httpconnection.httpsendfile(self.ui, tempname, "rb")
         headers = {'Content-Type': 'application/mercurial-0.1'}