--- a/mercurial/commands.py	Sat Oct 15 13:47:43 2016 +0900
+++ b/mercurial/commands.py	Sat Oct 15 13:57:17 2016 +0900
@@ -35,7 +35,6 @@
     bundle2,
     changegroup,
     cmdutil,
-    commandserver,
     copies,
     dagparser,
     dagutil,
@@ -6299,7 +6298,7 @@
         s.serve_forever()
 
     if opts["cmdserver"]:
-        service = commandserver.createservice(ui, repo, opts)
+        service = server.createcmdservice(ui, repo, opts)
     else:
         service = hgweb.createservice(ui, repo, opts)
     return server.runservice(opts, initfn=service.init, runfn=service.run)