diff --git a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
index 25fa89bf0a2dcba11f29ea2049376fecd138350f..67dbbda4c517937dec0a185530942b2a335a09e3 100644
--- a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
+++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp
@@ -155,7 +155,7 @@ bool MaemoUploadAndInstallPackageStep::isDeploymentPossible(QString *whyNot) con
         return false;
     }
     m_deployService->setPackageFilePath(pStep->packageFilePath());
-    return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+    return deployService()->isDeploymentPossible(whyNot);
 }
 
 QString MaemoUploadAndInstallPackageStep::stepId()
@@ -202,7 +202,7 @@ bool MeegoUploadAndInstallPackageStep::isDeploymentPossible(QString *whyNot) con
         return false;
     }
     m_deployService->setPackageFilePath(pStep->packageFilePath());
-    return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+    return deployService()->isDeploymentPossible(whyNot);
 }
 
 QString MeegoUploadAndInstallPackageStep::stepId()
diff --git a/src/plugins/madde/maemodeploybymountsteps.cpp b/src/plugins/madde/maemodeploybymountsteps.cpp
index 97adf54ecd18e79fbcdc895543300b2de6b8dd06..969daeb184d25a2091c8912ca064450fd179bc00 100644
--- a/src/plugins/madde/maemodeploybymountsteps.cpp
+++ b/src/plugins/madde/maemodeploybymountsteps.cpp
@@ -430,7 +430,7 @@ bool MaemoInstallPackageViaMountStep::isDeploymentPossible(QString *whyNot) cons
         return false;
     }
     m_deployService->setPackageFilePath(pStep->packageFilePath());
-    return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+    return deployService()->isDeploymentPossible(whyNot);
 }
 
 QString MaemoInstallPackageViaMountStep::stepId()
@@ -476,7 +476,7 @@ bool MaemoCopyFilesViaMountStep::isDeploymentPossible(QString *whyNot) const
     for (int i = 0; i < deployableCount; ++i)
         deployableFiles << deploymentInfo->deployableAt(i);
     m_deployService->setDeployableFiles(deployableFiles);
-    return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+    return deployService()->isDeploymentPossible(whyNot);
 }
 
 QString MaemoCopyFilesViaMountStep::stepId()
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
index 97fffe3c7d82df66c5f210b619afe48233eb189b..9f3bcabe1b82d6e82487ff474cc4c9342d4b82cd 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
@@ -80,19 +80,14 @@ QVariantMap AbstractRemoteLinuxDeployStep::toMap() const
 bool AbstractRemoteLinuxDeployStep::init()
 {
     QString error;
+    deployService()->setDeviceConfiguration(deployConfiguration()->deviceConfiguration());
+    deployService()->setBuildConfiguration(qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration()));
     const bool canDeploy = isDeploymentPossible(&error);
     if (!canDeploy)
         emit addOutput(tr("Deployment failed: %1").arg(error), ErrorMessageOutput);
     return canDeploy;
 }
 
-bool AbstractRemoteLinuxDeployStep::isDeploymentPossible(QString *whyNot) const
-{
-    deployService()->setDeviceConfiguration(deployConfiguration()->deviceConfiguration());
-    deployService()->setBuildConfiguration(qobject_cast<Qt4ProjectManager::Qt4BuildConfiguration *>(target()->activeBuildConfiguration()));
-    return deployService()->isDeploymentPossible(whyNot);
-}
-
 void AbstractRemoteLinuxDeployStep::run(QFutureInterface<bool> &fi)
 {
     connect(deployService(), SIGNAL(errorMessage(QString)), SLOT(handleErrorMessage(QString)));
diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
index 96fe6b316fcccf825879ca92534789c8afe945a2..fa4e8323edb1d8b8b0a060427c8bbb888f0c4a8f 100644
--- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
+++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.h
@@ -67,7 +67,7 @@ protected:
     AbstractRemoteLinuxDeployStep(ProjectExplorer::BuildStepList *bsl,
         AbstractRemoteLinuxDeployStep *other);
 
-    virtual bool isDeploymentPossible(QString *whyNot = 0) const;
+    virtual bool isDeploymentPossible(QString *whyNot = 0) const = 0;
 
 private slots:
     void handleProgressMessage(const QString &message);
diff --git a/src/plugins/remotelinux/genericdirectuploadstep.cpp b/src/plugins/remotelinux/genericdirectuploadstep.cpp
index 9c9ff6807ad3ef67431e3fd65d2fcfae5e87457f..fe2afb4bd3601780b8e98a6fb4ec3b444ecb93af 100644
--- a/src/plugins/remotelinux/genericdirectuploadstep.cpp
+++ b/src/plugins/remotelinux/genericdirectuploadstep.cpp
@@ -126,7 +126,7 @@ bool GenericDirectUploadStep::isDeploymentPossible(QString *whyNot) const
         deployableFiles << deploymentInfo->deployableAt(i);
     deployService()->setDeployableFiles(deployableFiles);
     deployService()->setIncrementalDeployment(incrementalDeployment());
-    return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+    return deployService()->isDeploymentPossible(whyNot);
 }
 
 GenericDirectUploadService *GenericDirectUploadStep::deployService() const
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
index c9e2fe7b99a52c7fa13b4afbbc24d81dae58e9d2..d46979dedd22d5b31d7d9598cb8da3eaf19edc8c 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeploymentstep.cpp
@@ -154,7 +154,7 @@ QString AbstractRemoteLinuxCustomCommandDeploymentStep::commandLine() const
 bool AbstractRemoteLinuxCustomCommandDeploymentStep::isDeploymentPossible(QString *whyNot) const
 {
     deployService()->setCommandLine(d->commandLine);
-    return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+    return deployService()->isDeploymentPossible(whyNot);
 }
 
 BuildStepConfigWidget *AbstractRemoteLinuxCustomCommandDeploymentStep::createConfigWidget()
diff --git a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
index 963f179eef6407241ed7302e81b7f10c3a2bc9e7..0a9ae3c9e8241fb482e0360099ffe37819023981 100644
--- a/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
+++ b/src/plugins/remotelinux/remotelinuxcustomcommanddeployservice.h
@@ -49,9 +49,10 @@ public:
 
     void setCommandLine(const QString &commandLine);
 
-protected:
     bool isDeploymentNecessary() const { return true; }
     bool isDeploymentPossible(QString *whyNot = 0) const;
+
+protected:
     void doDeviceSetup() { handleDeviceSetupDone(true); }
     void stopDeviceSetup() { handleDeviceSetupDone(false); }
     void doDeploy();
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 34ff7a4c559f5084c2bd9de8447ca0d4b93c7e07..758b57fc2339141c6017c8536e69e19cccf224f6 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -162,10 +162,6 @@ bool RemoteLinuxRunConfiguration::isEnabled() const
         d->disabledReason = tr("The .pro file could not be parsed.");
         return false;
     }
-    if (!deviceConfig()) {
-        d->disabledReason = tr("No device configuration set.");
-        return false;
-    }
     if (!activeQt4BuildConfiguration()) {
         d->disabledReason = tr("No active build configuration.");
         return false;
diff --git a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
index 2c7bfe3e8e83cfacc502d40df46a54d903b444ff..5aff8dc4e9149672408d4c13affae4246e155990 100644
--- a/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
+++ b/src/plugins/remotelinux/uploadandinstalltarpackagestep.cpp
@@ -96,7 +96,7 @@ bool UploadAndInstallTarPackageStep::isDeploymentPossible(QString *whyNot) const
         return false;
     }
     m_deployService->setPackageFilePath(pStep->packageFilePath());
-    return AbstractRemoteLinuxDeployStep::isDeploymentPossible(whyNot);
+    return m_deployService->isDeploymentPossible(whyNot);
 }
 
 QString UploadAndInstallTarPackageStep::stepId()