diff -r b7a75b9a3386 -r 0407a51b9d8c mercurial/sshpeer.py
--- a/mercurial/sshpeer.py	Tue Jul 11 08:52:55 2017 -0700
+++ b/mercurial/sshpeer.py	Fri Jul 14 14:22:40 2017 -0700
@@ -146,8 +146,8 @@
         self.port = u.port
         self.path = u.path or "."
 
-        sshcmd = self.ui.config("ui", "ssh", "ssh")
-        remotecmd = self.ui.config("ui", "remotecmd", "hg")
+        sshcmd = self.ui.config("ui", "ssh")
+        remotecmd = self.ui.config("ui", "remotecmd")
 
         args = util.sshargs(sshcmd,
                             _serverquote(self.host),