diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index e1bc60de2ab..f40957c0b7d 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -507,11 +507,6 @@ void EditorManager::updateAutoSave()
         d->m_autoSaveTimer->stop();
 }
 
-EditorToolBar *EditorManager::createToolBar(QWidget *parent)
-{
-    return new EditorToolBar(parent);
-}
-
 void EditorManager::removeEditor(IEditor *editor)
 {
     bool lastOneForDocument = false;
diff --git a/src/plugins/coreplugin/editormanager/editormanager.h b/src/plugins/coreplugin/editormanager/editormanager.h
index d0c264023c0..3e6ccd5a087 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.h
+++ b/src/plugins/coreplugin/editormanager/editormanager.h
@@ -95,8 +95,6 @@ public:
 
     static EditorManager *instance();
 
-    static EditorToolBar *createToolBar(QWidget *parent = 0);
-
     enum OpenEditorFlag {
         NoFlags = 0,
         DoNotChangeCurrentEditor = 1,
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index 2ca9f1613ca..f7e87ed8b13 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -61,7 +61,7 @@ using namespace Core::Internal;
 EditorView::EditorView(SplitterOrView *parentSplitterOrView, QWidget *parent) :
     QWidget(parent),
     m_parentSplitterOrView(parentSplitterOrView),
-    m_toolBar(EditorManager::createToolBar(this)),
+    m_toolBar(new EditorToolBar(this)),
     m_container(new QStackedWidget(this)),
     m_infoBarDisplay(new InfoBarDisplay(this)),
     m_statusHLine(new QFrame(this)),
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index c9c6ba369f0..193f7159fb3 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -292,7 +292,7 @@ void FormEditorW::fullInit()
     settings->endGroup();
 
     m_editorToolBar = createEditorToolBar();
-    m_toolBar = EditorManager::createToolBar();
+    m_toolBar = new EditorToolBar;
     m_toolBar->setToolbarCreationFlags(EditorToolBar::FlagsStandalone);
     m_toolBar->setNavigationVisible(false);
     m_toolBar->addCenterToolBar(m_editorToolBar);
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index 7a2fdaaa23e..1e06ca5ad99 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -173,7 +173,7 @@ void DocumentWarningWidget::goToError()
 DesignModeWidget::DesignModeWidget(QWidget *parent) :
     QWidget(parent),
     m_mainSplitter(0),
-    m_toolBar(Core::EditorManager::createToolBar(this)),
+    m_toolBar(new Core::EditorToolBar(this)),
     m_crumbleBar(new CrumbleBar(this)),
     m_isDisabled(false),
     m_showSidebars(true),