diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
index ad968d38202..deb380e49ce 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.cpp
@@ -49,19 +49,19 @@ namespace Internal {
 
 static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:";
 
-static QString pathFromId(const Core::Id id)
+static Utils::FileName pathFromId(const Core::Id id)
 {
-    return id.suffixAfter(ANDROID_RC_ID_PREFIX);
+    return Utils::FileName::fromString(id.suffixAfter(ANDROID_RC_ID_PREFIX));
 }
 
 QmakeAndroidRunConfiguration::QmakeAndroidRunConfiguration(Target *target)
     : AndroidRunConfiguration(target)
 {}
 
-void QmakeAndroidRunConfiguration::initialize(Core::Id id, const Utils::FileName &path)
+void QmakeAndroidRunConfiguration::initialize(Core::Id id)
 {
     AndroidRunConfiguration::initialize(id);
-    m_proFilePath = path;
+    m_proFilePath = pathFromId(id);
 
     ctor();
 }
@@ -110,7 +110,7 @@ QString QmakeAndroidRunConfiguration::defaultDisplayName()
             return node->displayName();
     }
 
-    return QFileInfo(pathFromId(id())).completeBaseName();
+    return displayNameForId(id());
 }
 
 QString QmakeAndroidRunConfiguration::disabledReason() const
@@ -129,6 +129,11 @@ QString QmakeAndroidRunConfiguration::buildSystemTarget() const
     return qmakeProject()->mapProFilePathToTarget(m_proFilePath);
 }
 
+QString QmakeAndroidRunConfiguration::displayNameForId(Core::Id id)
+{
+    return pathFromId(id).toFileInfo().completeBaseName();
+}
+
 QmakeProject *QmakeAndroidRunConfiguration::qmakeProject() const
 {
     Target *t = target();
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
index 817a78e2bac..c0265b9abbc 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunconfiguration.h
@@ -50,9 +50,11 @@ public:
 
     QString buildSystemTarget() const final;
 
+    static QString displayNameForId(Core::Id id);
+
 private:
     friend class ProjectExplorer::IRunConfigurationFactory;
-    void initialize(Core::Id id, const Utils::FileName &path = Utils::FileName());
+    void initialize(Core::Id id);
     void copyFrom(const QmakeAndroidRunConfiguration *source);
 
     bool fromMap(const QVariantMap &map) override;
diff --git a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
index e048479a420..4fd903972ce 100644
--- a/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
+++ b/src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
@@ -46,11 +46,6 @@ namespace Internal {
 
 static const char ANDROID_RC_ID_PREFIX[] = "Qt4ProjectManager.AndroidRunConfiguration:";
 
-static Utils::FileName pathFromId(const Core::Id id)
-{
-    return Utils::FileName::fromString(id.suffixAfter(ANDROID_RC_ID_PREFIX));
-}
-
 QmakeAndroidRunConfigurationFactory::QmakeAndroidRunConfigurationFactory(QObject *parent)
     : IRunConfigurationFactory(parent)
 {
@@ -58,7 +53,7 @@ QmakeAndroidRunConfigurationFactory::QmakeAndroidRunConfigurationFactory(QObject
 
 QString QmakeAndroidRunConfigurationFactory::displayNameForId(Core::Id id) const
 {
-    return pathFromId(id).toFileInfo().completeBaseName();
+    return QmakeAndroidRunConfiguration::displayNameForId(id);
 }
 
 bool QmakeAndroidRunConfigurationFactory::canCreate(Target *parent, Core::Id id) const
@@ -92,8 +87,6 @@ QList<Core::Id> QmakeAndroidRunConfigurationFactory::availableCreationIds(Target
 
 RunConfiguration *QmakeAndroidRunConfigurationFactory::doCreate(Target *parent, Core::Id id)
 {
-    if (parent->project()->rootProjectNode())
-        return createHelper<QmakeAndroidRunConfiguration>(parent, id, pathFromId(id));
     return createHelper<QmakeAndroidRunConfiguration>(parent, id);
 }