diff --git a/platform/analysis-impl/resources/META-INF/AnalysisImpl.analyzer.xml b/platform/analysis-impl/resources/META-INF/AnalysisImpl.analyzer.xml
index d2e2b060555c..53ce48e70e51 100644
--- a/platform/analysis-impl/resources/META-INF/AnalysisImpl.analyzer.xml
+++ b/platform/analysis-impl/resources/META-INF/AnalysisImpl.analyzer.xml
@@ -17,5 +17,7 @@
                     serviceImplementation="com.intellij.psi.impl.search.PsiSearchHelperImpl"/>
 
     <fileBasedIndex implementation="com.intellij.psi.search.FilenameIndexImpl"/>
+    <projectService serviceInterface="com.intellij.codeInsight.multiverse.EditorContextManager"
+                    serviceImplementation="com.intellij.codeInsight.multiverse.EditorContextManagerImpl"/>
   </extensions>
 </idea-plugin>
diff --git a/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml b/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
index aec6c6bfbf80..88e5cd711271 100644
--- a/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
+++ b/platform/analysis-impl/resources/META-INF/AnalysisImpl.xml
@@ -65,8 +65,6 @@
     <projectService serviceInterface="com.intellij.openapi.editor.LazyRangeMarkerFactory"
                     serviceImplementation="com.intellij.openapi.editor.impl.LazyRangeMarkerFactoryImpl"/>
 
-    <projectService serviceInterface="com.intellij.codeInsight.multiverse.EditorContextManager"
-                    serviceImplementation="com.intellij.codeInsight.multiverse.EditorContextManagerImpl"/>
     <multiverse.codeInsightContextPresentationProvider implementation="com.intellij.codeInsight.multiverse.ModuleEntityContextPresentationProvider"/>
     <iw.actionProvider implementation="com.intellij.openapi.editor.impl.multiverse.CodeInsightContextSwitcherProvider"/>
 
diff --git a/platform/core-impl/resources/META-INF/CoreImpl.analyzer.xml b/platform/core-impl/resources/META-INF/CoreImpl.analyzer.xml
index 6038fc1560e4..ed6dec7e0191 100644
--- a/platform/core-impl/resources/META-INF/CoreImpl.analyzer.xml
+++ b/platform/core-impl/resources/META-INF/CoreImpl.analyzer.xml
@@ -57,5 +57,6 @@
                         serviceImplementation="com.intellij.openapi.vfs.CompactVirtualFileSetFactory"/>
     <applicationService serviceInterface="com.intellij.diagnostic.PluginProblemReporter"
                         serviceImplementation="com.intellij.diagnostic.PluginProblemReporterImpl"/>
+    <projectService serviceImplementation="com.intellij.psi.impl.source.resolve.ResolveCache"/>
   </extensions>
 </idea-plugin>
diff --git a/platform/core-impl/resources/META-INF/CoreImpl.xml b/platform/core-impl/resources/META-INF/CoreImpl.xml
index b4381b819552..c3874ac8776a 100644
--- a/platform/core-impl/resources/META-INF/CoreImpl.xml
+++ b/platform/core-impl/resources/META-INF/CoreImpl.xml
@@ -39,7 +39,6 @@
                     serviceImplementation="com.intellij.util.CachedValuesManagerImpl"/>
     <projectService serviceInterface="com.intellij.util.CachedValuesFactory"
                     serviceImplementation="com.intellij.psi.impl.PsiCachedValuesFactory"/>
-    <projectService serviceImplementation="com.intellij.psi.impl.source.resolve.ResolveCache"/>
     <applicationService serviceInterface="com.intellij.psi.stubs.StubElementRegistryService"
                         serviceImplementation="com.intellij.psi.stubs.StubElementRegistryServiceImpl"/>
   </extensions>