diff --git a/src/plugins/boot2qt/qdbmakedefaultappservice.h b/src/plugins/boot2qt/qdbmakedefaultappservice.h
index 2c75016e645..cab4b4cb331 100644
--- a/src/plugins/boot2qt/qdbmakedefaultappservice.h
+++ b/src/plugins/boot2qt/qdbmakedefaultappservice.h
@@ -45,8 +45,6 @@ private:
     void handleProcessFinished(const QString &error);
 
     bool isDeploymentNecessary() const final { return true; }
-    void doDeviceSetup() final { handleDeviceSetupDone(true); }
-    void stopDeviceSetup() final { handleDeviceSetupDone(false); }
 
     void doDeploy() final;
     void stopDeployment() final;
diff --git a/src/plugins/boot2qt/qdbstopapplicationservice.h b/src/plugins/boot2qt/qdbstopapplicationservice.h
index 1b59073e37c..f9b35681823 100644
--- a/src/plugins/boot2qt/qdbstopapplicationservice.h
+++ b/src/plugins/boot2qt/qdbstopapplicationservice.h
@@ -47,8 +47,6 @@ private:
     void handleAppendMessage(const QString &message, Utils::OutputFormat format);
 
     bool isDeploymentNecessary() const final { return true; }
-    void doDeviceSetup() final { handleDeviceSetupDone(true); }
-    void stopDeviceSetup() final { handleDeviceSetupDone(false); }
 
     void doDeploy() final;
     void stopDeployment() final;
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
index 6ebf2d7592b..c59a77fd4c4 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeployservice.h
@@ -102,16 +102,16 @@ protected:
     void handleDeviceSetupDone(bool success);
     void handleDeploymentDone();
 
+    // Should do things needed *before* connecting. Call default implementation afterwards.
+    virtual void doDeviceSetup() { handleDeviceSetupDone(true); }
+    virtual void stopDeviceSetup() { handleDeviceSetupDone(false); }
+
 private:
     void handleConnected();
     void handleConnectionFailure();
 
     virtual bool isDeploymentNecessary() const = 0;
 
-    // Should do things needed *before* connecting. Call handleDeviceSetupDone() afterwards.
-    virtual void doDeviceSetup() = 0;
-    virtual void stopDeviceSetup() = 0;
-
     virtual void doDeploy() = 0;
     virtual void stopDeployment() = 0;
 
diff --git a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp
index d02dc82e54a..f307ed2dcc9 100644
--- a/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp
+++ b/src/plugins/remotelinux/abstractuploadandinstallpackageservice.cpp
@@ -89,15 +89,13 @@ bool AbstractUploadAndInstallPackageService::isDeploymentNecessary() const
 void AbstractUploadAndInstallPackageService::doDeviceSetup()
 {
     QTC_ASSERT(d->state == Inactive, return);
-
-    handleDeviceSetupDone(true);
+    AbstractRemoteLinuxDeployService::doDeviceSetup();
 }
 
 void AbstractUploadAndInstallPackageService::stopDeviceSetup()
 {
     QTC_ASSERT(d->state == Inactive, return);
-
-    handleDeviceSetupDone(false);
+    AbstractRemoteLinuxDeployService::stopDeviceSetup();
 }
 
 void AbstractUploadAndInstallPackageService::doDeploy()
diff --git a/src/plugins/remotelinux/genericdirectuploadservice.cpp b/src/plugins/remotelinux/genericdirectuploadservice.cpp
index 5cb7f00b7d6..ecbac0498c6 100644
--- a/src/plugins/remotelinux/genericdirectuploadservice.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadservice.cpp
@@ -118,15 +118,13 @@ bool GenericDirectUploadService::isDeploymentNecessary() const
 void GenericDirectUploadService::doDeviceSetup()
 {
     QTC_ASSERT(d->state == Inactive, return);
-
-    handleDeviceSetupDone(true);
+    AbstractRemoteLinuxDeployService::doDeviceSetup();
 }
 
 void GenericDirectUploadService::stopDeviceSetup()
 {
     QTC_ASSERT(d->state == Inactive, return);
-
-    handleDeviceSetupDone(false);
+    AbstractRemoteLinuxDeployService::stopDeviceSetup();
 }
 
 void GenericDirectUploadService::doDeploy()
diff --git a/src/plugins/remotelinux/genericdirectuploadservice.h b/src/plugins/remotelinux/genericdirectuploadservice.h
index 7e81406d77b..998a8275527 100644
--- a/src/plugins/remotelinux/genericdirectuploadservice.h
+++ b/src/plugins/remotelinux/genericdirectuploadservice.h
@@ -53,7 +53,7 @@ public:
     void setIncrementalDeployment(IncrementalDeployment incremental);
     void setIgnoreMissingFiles(bool ignoreMissingFiles);
 
-  protected:
+protected:
     bool isDeploymentNecessary() const override;
 
     void doDeviceSetup() override;
diff --git a/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h b/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h
index 2819eb00c7b..6e81520df60 100644
--- a/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h
+++ b/src/plugins/remotelinux/remotelinuxcheckforfreediskspaceservice.h
@@ -46,8 +46,6 @@ private:
     void handleProcessFinished();
 
     bool isDeploymentNecessary() const override { return true; }
-    void doDeviceSetup() override { handleDeviceSetupDone(true); }
-    void stopDeviceSetup() override { handleDeviceSetupDone(false); }
 
     CheckResult isDeploymentPossible() const override;
     void doDeploy() override;
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
index cc2f7fb129f..ee0ff0ebcc1 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
@@ -44,8 +44,6 @@ public:
     CheckResult isDeploymentPossible() const override;
 
 protected:
-    void doDeviceSetup() override { handleDeviceSetupDone(true); }
-    void stopDeviceSetup() override { handleDeviceSetupDone(false); }
     void doDeploy() override;
     void stopDeployment() override;
 
diff --git a/src/plugins/remotelinux/remotelinuxkillappservice.h b/src/plugins/remotelinux/remotelinuxkillappservice.h
index c3ff4f5e0e4..042f4bac0ea 100644
--- a/src/plugins/remotelinux/remotelinuxkillappservice.h
+++ b/src/plugins/remotelinux/remotelinuxkillappservice.h
@@ -44,8 +44,6 @@ private:
     void handleProcessFinished();
 
     bool isDeploymentNecessary() const override;
-    void doDeviceSetup() override { handleDeviceSetupDone(true); }
-    void stopDeviceSetup() override { handleDeviceSetupDone(false); }
 
     void doDeploy() override;
     void stopDeployment() override;
diff --git a/src/plugins/remotelinux/rsyncdeploystep.cpp b/src/plugins/remotelinux/rsyncdeploystep.cpp
index c5a2840dbc7..21981ba9626 100644
--- a/src/plugins/remotelinux/rsyncdeploystep.cpp
+++ b/src/plugins/remotelinux/rsyncdeploystep.cpp
@@ -57,9 +57,6 @@ public:
 private:
     bool isDeploymentNecessary() const override;
 
-    void doDeviceSetup() override { handleDeviceSetupDone(true); }
-    void stopDeviceSetup() override { handleDeviceSetupDone(false); };
-
     void doDeploy() override;
     void stopDeployment() override { setFinished(); };