diff --git a/src/plugins/debugger/analyzer/startremotedialog.cpp b/src/plugins/debugger/analyzer/startremotedialog.cpp
index 89b03b8f2d8..13dcf456a42 100644
--- a/src/plugins/debugger/analyzer/startremotedialog.cpp
+++ b/src/plugins/debugger/analyzer/startremotedialog.cpp
@@ -128,19 +128,11 @@ void StartRemoteDialog::validate()
     d->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid);
 }
 
-QUrl StartRemoteDialog::serverUrl() const
-{
-    QUrl url;
-    Kit *kit = d->kitChooser->currentKit();
-    IDevice::ConstPtr device = DeviceKitInformation::device(kit);
-    url.setHost(device->sshParameters().host);
-    url.setPort(device->sshParameters().port);
-    return url;
-}
-
 StandardRunnable StartRemoteDialog::runnable() const
 {
+    Kit *kit = d->kitChooser->currentKit();
     StandardRunnable r;
+    r.device = DeviceKitInformation::device(kit);
     r.executable = d->executable->text();
     r.commandLineArguments = d->arguments->text();
     r.workingDirectory = d->workingDirectory->text();
diff --git a/src/plugins/debugger/analyzer/startremotedialog.h b/src/plugins/debugger/analyzer/startremotedialog.h
index 91e61873162..1a9df377fa4 100644
--- a/src/plugins/debugger/analyzer/startremotedialog.h
+++ b/src/plugins/debugger/analyzer/startremotedialog.h
@@ -28,7 +28,6 @@
 #include <debugger/debugger_global.h>
 
 #include <QDialog>
-#include <QUrl>
 
 namespace ProjectExplorer { class StandardRunnable; }
 
@@ -44,7 +43,6 @@ public:
     explicit StartRemoteDialog(QWidget *parent = 0);
     ~StartRemoteDialog() override;
 
-    QUrl serverUrl() const;
     ProjectExplorer::StandardRunnable runnable() const;
 
 private:
diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp
index 2419985b838..c93a406c900 100644
--- a/src/plugins/valgrind/callgrindtool.cpp
+++ b/src/plugins/valgrind/callgrindtool.cpp
@@ -289,7 +289,6 @@ CallgrindTool::CallgrindTool(QObject *parent)
         auto runControl = new RunControl(runConfig, CALLGRIND_RUN_MODE);
         const auto runnable = dlg.runnable();
         runControl->setRunnable(runnable);
-        runControl->setConnection(UrlConnection(dlg.serverUrl()));
         runControl->setDisplayName(runnable.executable);
         createRunTool(runControl);
         ProjectExplorerPlugin::startRunControl(runControl);
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp
index 16977250a69..e6c70188340 100644
--- a/src/plugins/valgrind/memchecktool.cpp
+++ b/src/plugins/valgrind/memchecktool.cpp
@@ -454,7 +454,6 @@ MemcheckTool::MemcheckTool(QObject *parent)
         rc->createWorker(MEMCHECK_RUN_MODE);
         const auto runnable = dlg.runnable();
         rc->setRunnable(runnable);
-        rc->setConnection(UrlConnection(dlg.serverUrl()));
         rc->setDisplayName(runnable.executable);
         ProjectExplorerPlugin::startRunControl(rc);
     });