diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index dd5c03a36cd..bb92eeb027d 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -564,7 +564,7 @@ public:
     {
         setDisplayName(Tr::tr("Custom"));
         setSupportedToolchainType(Constants::CUSTOM_TOOLCHAIN_TYPEID);
-        setSupportsAllLanguages(true);
+        setSupportedLanguages({Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID});
         setToolchainConstructor([] { return new CustomToolchain; });
         setUserCreatable(true);
     }
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 8da3ee7d771..0fa9033fabb 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -659,7 +659,7 @@ Toolchain *ToolchainFactory::createToolchain(Id toolchainType)
 
 QList<Id> ToolchainFactory::supportedLanguages() const
 {
-    return m_supportsAllLanguages ? ToolchainManager::allLanguages() : m_supportedLanguages;
+    return m_supportedLanguages;
 }
 
 Id ToolchainFactory::supportedToolchainType() const
@@ -683,11 +683,6 @@ void ToolchainFactory::setSupportedLanguages(const QList<Id> &supportedLanguages
     m_supportedLanguages = supportedLanguages;
 }
 
-void ToolchainFactory::setSupportsAllLanguages(bool supportsAllLanguages)
-{
-    m_supportsAllLanguages = supportsAllLanguages;
-}
-
 void ToolchainFactory::setToolchainConstructor(const ToolchainConstructor &toolchainContructor)
 {
     m_toolchainConstructor = toolchainContructor;
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index daf1c30afe3..5467d82abb9 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -296,7 +296,6 @@ protected:
     void setDisplayName(const QString &name) { m_displayName = name; }
     void setSupportedToolchainType(const Utils::Id &supportedToolchainType);
     void setSupportedLanguages(const QList<Utils::Id> &supportedLanguages);
-    void setSupportsAllLanguages(bool supportsAllLanguages);
     using ToolchainConstructor = std::function<Toolchain *()>;
     void setToolchainConstructor(const ToolchainConstructor &constructor);
     ToolchainConstructor toolchainConstructor() const;
@@ -318,7 +317,6 @@ private:
     QString m_displayName;
     Utils::Id m_supportedToolchainType;
     QList<Utils::Id> m_supportedLanguages;
-    bool m_supportsAllLanguages = false;
     bool m_userCreatable = false;
     ToolchainConstructor m_toolchainConstructor;
 };