diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp
index de48b7fbbed..4193a87e05f 100644
--- a/src/plugins/android/androidbuildapkstep.cpp
+++ b/src/plugins/android/androidbuildapkstep.cpp
@@ -134,15 +134,6 @@ AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent)
     setImmutable(true);
 }
 
-AndroidBuildApkStep *AndroidBuildApkStep::findInBuild(const BuildConfiguration *bc)
-{
-    if (!bc)
-        return nullptr;
-    BuildStepList *bsl = bc->buildSteps();
-    QTC_ASSERT(bsl, return nullptr);
-    return bsl->firstOfType<AndroidBuildApkStep>();
-}
-
 bool AndroidBuildApkStep::init()
 {
     ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
diff --git a/src/plugins/android/androidbuildapkstep.h b/src/plugins/android/androidbuildapkstep.h
index 2ed137ccc3e..911c0aa8cf4 100644
--- a/src/plugins/android/androidbuildapkstep.h
+++ b/src/plugins/android/androidbuildapkstep.h
@@ -45,8 +45,6 @@ class ANDROID_EXPORT AndroidBuildApkStep : public ProjectExplorer::AbstractProce
 public:
     AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc);
 
-    static AndroidBuildApkStep *findInBuild(const ProjectExplorer::BuildConfiguration *bc);
-
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
 
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp
index b9182938832..544b55867c1 100644
--- a/src/plugins/android/androiddeployqtstep.cpp
+++ b/src/plugins/android/androiddeployqtstep.cpp
@@ -174,8 +174,9 @@ bool AndroidDeployQtStep::init()
     RunConfiguration *rc = target()->activeRunConfiguration();
     QTC_ASSERT(rc, return false);
     ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
+    QTC_ASSERT(rc, return false);
 
-    auto androidBuildApkStep = AndroidBuildApkStep::findInBuild(bc);
+    auto androidBuildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>();
     int minTargetApi = AndroidManager::minimumSDK(target());
     qCDebug(deployStepLog) << "Target architecture:" << m_androidABIs
                            << "Min target API" << minTargetApi;
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index d883496e6cc..315ec204674 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -250,8 +250,10 @@ int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit)
 
 QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target)
 {
-    if (auto androidBuildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration()))
-        return androidBuildApkStep->buildTargetSdk();
+    if (auto bc = target->activeBuildConfiguration()) {
+        if (auto androidBuildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>())
+            return androidBuildApkStep->buildTargetSdk();
+    }
 
     QString fallback = AndroidConfig::apiLevelNameFor(
                 AndroidConfigurations::sdkManager()->latestAndroidSdkPlatform());
@@ -297,7 +299,10 @@ Utils::FilePath AndroidManager::apkPath(const ProjectExplorer::Target *target)
 {
     QTC_ASSERT(target, return Utils::FilePath());
 
-    auto buildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration());
+    auto bc = target->activeBuildConfiguration();
+    if (!bc)
+        return {};
+    auto buildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>();
     if (!buildApkStep)
         return Utils::FilePath();
 
@@ -314,7 +319,10 @@ FilePath AndroidManager::aabPath(const Target *target)
 {
     QTC_ASSERT(target, return Utils::FilePath());
 
-    auto buildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration());
+    auto bc = target->activeBuildConfiguration();
+    if (!bc)
+        return {};
+    auto buildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>();
     if (!buildApkStep)
         return Utils::FilePath();