--- a/mercurial/changegroup.py	Sun Sep 10 18:51:31 2017 -0700
+++ b/mercurial/changegroup.py	Sun Sep 10 18:52:40 2017 -0700
@@ -911,11 +911,6 @@
         for node in nodes:
             repo.ui.debug("%s\n" % hex(node))
 
-def makestream(repo, outgoing, version, source, fastpath=False,
-               bundlecaps=None):
-    bundler = getbundler(version, repo, bundlecaps=bundlecaps)
-    return getsubsetraw(repo, outgoing, bundler, source, fastpath=fastpath)
-
 def makechangegroup(repo, outgoing, version, source, fastpath=False,
                     bundlecaps=None):
     cgstream = makestream(repo, outgoing, version, source,
@@ -923,7 +918,10 @@
     return getunbundler(version, util.chunkbuffer(cgstream), None,
                         {'clcount': len(outgoing.missing) })
 
-def getsubsetraw(repo, outgoing, bundler, source, fastpath=False):
+def makestream(repo, outgoing, version, source, fastpath=False,
+               bundlecaps=None):
+    bundler = getbundler(version, repo, bundlecaps=bundlecaps)
+
     repo = repo.unfiltered()
     commonrevs = outgoing.common
     csets = outgoing.missing