diff -r f85dfde1731a -r f7d41b85bbf6 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Sun Sep 10 18:39:02 2017 -0700
+++ b/mercurial/localrepo.py	Sun Sep 10 18:43:59 2017 -0700
@@ -31,6 +31,7 @@
     context,
     dirstate,
     dirstateguard,
+    discovery,
     encoding,
     error,
     exchange,
@@ -289,7 +290,9 @@
         return changegroup.changegroup(self._repo, basenodes, source)
 
     def changegroupsubset(self, bases, heads, source):
-        return changegroup.changegroupsubset(self._repo, bases, heads, source)
+        outgoing = discovery.outgoing(self._repo, missingroots=bases,
+                                      missingheads=heads)
+        return changegroup.makechangegroup(self._repo, outgoing, '01', source)
 
     # End of baselegacywirecommands interface.