diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 22b58fcea8d..3be2f5f4831 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -751,7 +751,7 @@ void CMakeProject::createUiCodeModelSupport()
             uiFileHash.insert(uiFile, uiHeaderFile(uiFile));
     }
 
-    QtSupport::UiCodeModelManager::instance()->update(this, uiFileHash);
+    QtSupport::UiCodeModelManager::update(this, uiFileHash);
 }
 
 // CMakeFile
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index d470c79ae3b..d43fdc8b036 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -610,7 +610,7 @@ void Qt4Project::updateCppCodeModel()
     setProjectLanguage(ProjectExplorer::Constants::LANG_CXX, !allFiles.isEmpty());
 
     // Also update Ui Code Model Support:
-    QtSupport::UiCodeModelManager::instance()->update(this, uiCodeModelData);
+    QtSupport::UiCodeModelManager::update(this, uiCodeModelData);
 
     m_codeModelFuture = modelmanager->updateProjectInfo(pinfo);
 }
diff --git a/src/plugins/qtsupport/uicodemodelsupport.cpp b/src/plugins/qtsupport/uicodemodelsupport.cpp
index 0579e0e13dd..dad06aa21ba 100644
--- a/src/plugins/qtsupport/uicodemodelsupport.cpp
+++ b/src/plugins/qtsupport/uicodemodelsupport.cpp
@@ -324,11 +324,6 @@ UiCodeModelManager::UiCodeModelManager() :
             this, SLOT(editorWasChanged(Core::IEditor*)));
 }
 
-UiCodeModelManager *UiCodeModelManager::instance()
-{
-    return m_instance;
-}
-
 UiCodeModelManager::~UiCodeModelManager()
 {
     m_instance = 0;
@@ -348,7 +343,7 @@ void UiCodeModelManager::update(ProjectExplorer::Project *project, QHash<QString
     CppTools::CppModelManagerInterface *mm = CppTools::CppModelManagerInterface::instance();
 
     // Find support to add/update:
-    QList<UiCodeModelSupport *> oldSupport = m_projectUiSupport.value(project);
+    QList<UiCodeModelSupport *> oldSupport = m_instance->m_projectUiSupport.value(project);
     QList<UiCodeModelSupport *> newSupport;
     QHash<QString, QString>::const_iterator it;
     for (it = uiHeaders.constBegin(); it != uiHeaders.constEnd(); ++it) {
@@ -370,13 +365,14 @@ void UiCodeModelManager::update(ProjectExplorer::Project *project, QHash<QString
     }
 
     // Update state:
-    m_projectUiSupport.insert(project, newSupport);
+    m_instance->m_projectUiSupport.insert(project, newSupport);
 }
 
 void UiCodeModelManager::updateContents(const QString &uiFileName, const QString &contents)
 {
     QHash<ProjectExplorer::Project *, QList<UiCodeModelSupport *> >::iterator i;
-    for (i = m_projectUiSupport.begin(); i != m_projectUiSupport.end(); ++i) {
+    for (i = m_instance->m_projectUiSupport.begin();
+         i != m_instance->m_projectUiSupport.end(); ++i) {
         foreach (UiCodeModelSupport *support, i.value()) {
             if (support->uiFileName() == uiFileName)
                 support->updateFromEditor(contents);
diff --git a/src/plugins/qtsupport/uicodemodelsupport.h b/src/plugins/qtsupport/uicodemodelsupport.h
index 293491b0713..bd2b9d31c09 100644
--- a/src/plugins/qtsupport/uicodemodelsupport.h
+++ b/src/plugins/qtsupport/uicodemodelsupport.h
@@ -93,12 +93,9 @@ class QTSUPPORT_EXPORT UiCodeModelManager : public QObject
     Q_OBJECT
 
 public:
-    static UiCodeModelManager *instance();
-    ~UiCodeModelManager();
-
     // This needs to be called by the project *before* the C++ code model is updated!
-    void update(ProjectExplorer::Project *project,
-                QHash<QString, QString> uiHeaders);
+    static void update(ProjectExplorer::Project *project,
+                       QHash<QString, QString> uiHeaders);
 
 private slots:
     void buildStateHasChanged(ProjectExplorer::Project *project);
@@ -109,8 +106,9 @@ private slots:
 
 private:
     UiCodeModelManager();
+    ~UiCodeModelManager();
 
-    void updateContents(const QString &uiFileName, const QString &contents);
+    static void updateContents(const QString &uiFileName, const QString &contents);
 
     QHash<ProjectExplorer::Project *, QList<UiCodeModelSupport *> > m_projectUiSupport;
     Core::IEditor *m_lastEditor;