diff --git a/src/plugins/android/androidgdbserverkitinformation.cpp b/src/plugins/android/androidgdbserverkitinformation.cpp
index 8414c466e0a..e3ab975a8fd 100644
--- a/src/plugins/android/androidgdbserverkitinformation.cpp
+++ b/src/plugins/android/androidgdbserverkitinformation.cpp
@@ -26,6 +26,7 @@
 #include "androidgdbserverkitinformation.h"
 #include "androidconstants.h"
 #include "androidtoolchain.h"
+#include "androidconfigurations.h"
 
 #include <utils/pathchooser.h>
 #include <utils/elidinglabel.h>
@@ -129,8 +130,7 @@ FilePath AndroidGdbServerKitAspect::autoDetect(const Kit *kit)
     ToolChain *tc = ToolChainKitAspect::toolChain(kit, ProjectExplorer::Constants::CXX_LANGUAGE_ID);
     if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPEID)
         return FilePath();
-    auto atc = static_cast<AndroidToolChain *>(tc);
-    return atc->suggestedGdbServer();
+    return AndroidConfigurations::currentConfig().gdbServer(tc->targetAbi());
 }
 
 ///////////////
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index 26f28ed6c93..8beb1a31016 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -105,11 +105,6 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
             AndroidConfigurations::currentConfig().sdkLocation().toString());
 }
 
-FilePath AndroidToolChain::suggestedGdbServer() const
-{
-    return AndroidConfigurations::currentConfig().gdbServer(targetAbi());
-}
-
 bool AndroidToolChain::fromMap(const QVariantMap &data)
 {
     if (!ClangToolChain::fromMap(data))
diff --git a/src/plugins/android/androidtoolchain.h b/src/plugins/android/androidtoolchain.h
index 359ba447f47..e46324d8511 100644
--- a/src/plugins/android/androidtoolchain.h
+++ b/src/plugins/android/androidtoolchain.h
@@ -41,7 +41,6 @@ public:
     bool isValid() const override;
     void addToEnvironment(Utils::Environment &env) const override;
 
-    Utils::FilePath suggestedGdbServer() const;
     QStringList suggestedMkspecList() const override;
     Utils::FilePath makeCommand(const Utils::Environment &environment) const override;
     bool fromMap(const QVariantMap &data) override;