diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
index e56970d9598..c95c606e536 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
@@ -211,8 +211,7 @@ void ClangModelManagerSupport::startLocalRenaming(const CppEditor::CursorInEdito
 }
 
 void ClangModelManagerSupport::globalRename(const CppEditor::CursorInEditor &cursor,
-                                     CppEditor::UsagesCallback &&callback,
-                                     const QString &replacement)
+                                            const QString &replacement)
 {
     if (ClangdClient * const client = clientForFile(cursor.filePath());
             client && client->isFullyIndexed()) {
@@ -221,8 +220,7 @@ void ClangModelManagerSupport::globalRename(const CppEditor::CursorInEditor &cur
         client->findUsages(cursor.textDocument(), cursor.cursor(), replacement);
         return;
     }
-    CppModelManager::globalRename(cursor, std::move(callback), replacement,
-                                  CppModelManager::Backend::Builtin);
+    CppModelManager::globalRename(cursor, replacement, CppModelManager::Backend::Builtin);
 }
 
 void ClangModelManagerSupport::findUsages(const CppEditor::CursorInEditor &cursor,
diff --git a/src/plugins/clangcodemodel/clangmodelmanagersupport.h b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
index 4233f734b09..32acad56168 100644
--- a/src/plugins/clangcodemodel/clangmodelmanagersupport.h
+++ b/src/plugins/clangcodemodel/clangmodelmanagersupport.h
@@ -90,8 +90,7 @@ private:
     void startLocalRenaming(const CppEditor::CursorInEditor &data,
                             const CppEditor::ProjectPart *projectPart,
                             CppEditor::RenameCallback &&renameSymbolsCallback) override;
-    void globalRename(const CppEditor::CursorInEditor &cursor, CppEditor::UsagesCallback &&callback,
-                      const QString &replacement) override;
+    void globalRename(const CppEditor::CursorInEditor &cursor, const QString &replacement) override;
     void findUsages(const CppEditor::CursorInEditor &cursor,
                     CppEditor::UsagesCallback &&callback) const override;
     void switchHeaderSource(const Utils::FilePath &filePath, bool inNextSplit) override;
diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
index 4e2f442bebc..bb121d0f56e 100644
--- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
+++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.cpp
@@ -170,7 +170,6 @@ void BuiltinModelManagerSupport::startLocalRenaming(const CursorInEditor &data,
 }
 
 void BuiltinModelManagerSupport::globalRename(const CursorInEditor &data,
-                                              UsagesCallback &&,
                                               const QString &replacement)
 {
     CppModelManager *modelManager = CppModelManager::instance();
diff --git a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h
index c5b1406b8b3..fbf6f7bc5f2 100644
--- a/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h
+++ b/src/plugins/cppeditor/cppbuiltinmodelmanagersupport.h
@@ -58,8 +58,7 @@ private:
     void startLocalRenaming(const CursorInEditor &data,
                             const ProjectPart *projectPart,
                             RenameCallback &&renameSymbolsCallback) override;
-    void globalRename(const CursorInEditor &data, UsagesCallback &&,
-                      const QString &replacement) override;
+    void globalRename(const CursorInEditor &data, const QString &replacement) override;
     void findUsages(const CursorInEditor &data, UsagesCallback &&) const override;
     void switchHeaderSource(const Utils::FilePath &filePath, bool inNextSplit) override;
 
diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp
index 7c00340fd5c..b5ff4d61d26 100644
--- a/src/plugins/cppeditor/cppeditorwidget.cpp
+++ b/src/plugins/cppeditor/cppeditorwidget.cpp
@@ -810,14 +810,7 @@ void CppEditorWidget::renameUsages(const QString &replacement, QTextCursor curso
     CursorInEditor cursorInEditor{cursor, textDocument()->filePath(), this,
                 textDocument()};
     QPointer<CppEditorWidget> cppEditorWidget = this;
-    d->m_modelManager->globalRename(cursorInEditor,
-                                    [=](const Usages &usages) {
-                                        if (!cppEditorWidget)
-                                            return;
-                                        findRenameCallback(cppEditorWidget.data(), cursor, usages,
-                                                           true, replacement);
-                                    },
-                                    replacement);
+    d->m_modelManager->globalRename(cursorInEditor, replacement);
 }
 
 bool CppEditorWidget::selectBlockUp()
diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp
index b1b93787980..55eb9328ce3 100644
--- a/src/plugins/cppeditor/cppmodelmanager.cpp
+++ b/src/plugins/cppeditor/cppmodelmanager.cpp
@@ -316,11 +316,10 @@ void CppModelManager::startLocalRenaming(const CursorInEditor &data,
             ->startLocalRenaming(data, projectPart, std::move(renameSymbolsCallback));
 }
 
-void CppModelManager::globalRename(const CursorInEditor &data, UsagesCallback &&renameCallback,
-                                   const QString &replacement, Backend backend)
+void CppModelManager::globalRename(const CursorInEditor &data, const QString &replacement,
+                                   Backend backend)
 {
-    instance()->modelManagerSupport(backend)
-            ->globalRename(data, std::move(renameCallback), replacement);
+    instance()->modelManagerSupport(backend)->globalRename(data, replacement);
 }
 
 void CppModelManager::findUsages(const CursorInEditor &data,
diff --git a/src/plugins/cppeditor/cppmodelmanager.h b/src/plugins/cppeditor/cppmodelmanager.h
index da04a942612..af4b616d90c 100644
--- a/src/plugins/cppeditor/cppmodelmanager.h
+++ b/src/plugins/cppeditor/cppmodelmanager.h
@@ -179,8 +179,8 @@ public:
     static void startLocalRenaming(const CursorInEditor &data, const ProjectPart *projectPart,
                                    RenameCallback &&renameSymbolsCallback,
                                    Backend backend = Backend::Best);
-    static void globalRename(const CursorInEditor &data, UsagesCallback &&renameCallback,
-                             const QString &replacement, Backend backend = Backend::Best);
+    static void globalRename(const CursorInEditor &data, const QString &replacement,
+                             Backend backend = Backend::Best);
     static void findUsages(const CursorInEditor &data, UsagesCallback &&showUsagesCallback,
                            Backend backend = Backend::Best);
     static void switchHeaderSource(bool inNextSplit, Backend backend = Backend::Best);
diff --git a/src/plugins/cppeditor/cppmodelmanagersupport.h b/src/plugins/cppeditor/cppmodelmanagersupport.h
index 1c789dc99c8..40ea575232a 100644
--- a/src/plugins/cppeditor/cppmodelmanagersupport.h
+++ b/src/plugins/cppeditor/cppmodelmanagersupport.h
@@ -73,9 +73,7 @@ public:
     virtual void startLocalRenaming(const CursorInEditor &data,
                                     const ProjectPart *projectPart,
                                     RenameCallback &&renameSymbolsCallback) = 0;
-    virtual void globalRename(const CursorInEditor &data,
-                              UsagesCallback &&renameCallback,
-                              const QString &replacement) = 0;
+    virtual void globalRename(const CursorInEditor &data, const QString &replacement) = 0;
     virtual void findUsages(const CursorInEditor &data,
                             UsagesCallback &&showUsagesCallback) const = 0;
     virtual void switchHeaderSource(const Utils::FilePath &filePath, bool inNextSplit) = 0;