diff --git a/infinitepush/__init__.py b/infinitepush/__init__.py
--- a/infinitepush/__init__.py
+++ b/infinitepush/__init__.py
@@ -1059,7 +1059,6 @@
         pass
 
     bundler = bundle2.bundle20(repo.ui)
-    cgparams = None
     scratchbookpart = None
     with bundle2.partiterator(repo, op, unbundler) as parts:
         for part in parts:
@@ -1073,10 +1072,7 @@
                 # when we upload to the store. Eventually those parameters will
                 # be put on the actual bundle instead of this part, then we can
                 # send a vanilla changegroup instead of the scratchbranch part.
-                cgversion = part.params.get('cgversion', '01')
-                bundlepart = bundle2.bundlepart('changegroup', data=part.read())
-                bundlepart.addparam('version', cgversion)
-                cgparams = part.params
+                bundle2._processpart(op, part)
 
                 # If we're not dumping all parts into the new bundle, we need to
                 # alert the future pushkey and phase-heads handler to skip
@@ -1120,24 +1116,6 @@
             if bundlepart:
                 bundler.addpart(bundlepart)
 
-    # If commits were sent, store them
-    if cgparams:
-        buf = util.chunkbuffer(bundler.getchunks())
-        fd, bundlefile = tempfile.mkstemp()
-        try:
-            try:
-                fp = os.fdopen(fd, 'wb')
-                fp.write(buf.read())
-            finally:
-                fp.close()
-            storebundle(op, cgparams, bundlefile)
-        finally:
-            try:
-                os.unlink(bundlefile)
-            except Exception:
-                # we would rather see the original exception
-                pass
-
     # The scratch bookmark part is sent as part of a push backup. It needs to be
     # processed after the main bundle has been stored, so that any commits it
     # references are available in the store.