diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 8469327414d..0f76dd8e53b 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -5243,10 +5243,12 @@ ExtractFunction::ExtractFunction(FunctionNameGetter functionNameGetter)
 void ExtractFunction::match(const CppQuickFixInterface &interface, QuickFixOperations &result)
 {
     const CppRefactoringFilePtr file = interface.currentFile();
-    if (CppModelManager::usesClangd(file->editor()->textDocument())
-            && file->cppDocument()->languageFeatures().cxxEnabled) {
-        return;
-    }
+
+    // TODO: Fix upstream and uncomment; see QTCREATORBUG-28030.
+//    if (CppModelManager::usesClangd(file->editor()->textDocument())
+//            && file->cppDocument()->languageFeatures().cxxEnabled) {
+//        return;
+//    }
 
     QTextCursor cursor = file->cursor();
     if (!cursor.hasSelection())