--- a/mercurial/commands.py	Sat Oct 15 14:09:36 2016 +0900
+++ b/mercurial/commands.py	Sat Oct 15 14:19:16 2016 +0900
@@ -6296,10 +6296,7 @@
         s = sshserver.sshserver(ui, repo)
         s.serve_forever()
 
-    if opts["cmdserver"]:
-        service = server.createcmdservice(ui, repo, opts)
-    else:
-        service = server.createhgwebservice(ui, repo, opts)
+    service = server.createservice(ui, repo, opts)
     return server.runservice(opts, initfn=service.init, runfn=service.run)
 
 @command('^status|st',