diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
index ed6c6de72dc6..590c5e4c5ab9 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/BuildTasksImpl.groovy
@@ -274,18 +274,18 @@ idea.fatal.error.notification=disabled
   }
 
   private compileModulesForDistribution(DistributionJARsBuilder distributionJARsBuilder) {
-    def bundledPlugins = buildContext.productProperties.productLayout.bundledPluginModules as Set<String>
-    def moduleNames = buildContext.productProperties.productLayout.getIncludedPluginModules(bundledPlugins) +
-                      distributionJARsBuilder.platformModules +
-                      buildContext.productProperties.additionalModulesToCompile +
-                      (buildContext.proprietaryBuildTools.scrambleTool?.additionalModulesToCompile ?: [])
-    compileModules(moduleNames, buildContext.productProperties.modulesToCompileTests)
-
     def productLayout = buildContext.productProperties.productLayout
+    def bundledPlugins = productLayout.bundledPluginModules as Set<String>
+    def moduleNames = productLayout.getIncludedPluginModules(bundledPlugins) +
+                      distributionJARsBuilder.platformModules +
+                      buildContext.productProperties.additionalModulesToCompile
+    compileModules(moduleNames + (buildContext.proprietaryBuildTools.scrambleTool?.additionalModulesToCompile ?: []) +
+                   productLayout.mainModules, buildContext.productProperties.modulesToCompileTests)
+
     def pluginsToPublish = distributionJARsBuilder.getPluginsByModules(buildContext.productProperties.productLayout.pluginModulesToPublish) 
     if (buildContext.shouldBuildDistributions()) {
       def providedModulesFilePath = "${buildContext.paths.artifacts}/${buildContext.productProperties.productCode}-builtinModules.json"
-      buildProvidedModulesList(providedModulesFilePath, productLayout.mainModules, productLayout.licenseFilesToBuildSearchableOptions)
+      buildProvidedModulesList(providedModulesFilePath, moduleNames, productLayout.licenseFilesToBuildSearchableOptions)
       if (buildContext.productProperties.productLayout.buildAllCompatiblePlugins) {
         if (!buildContext.options.buildStepsToSkip.contains(BuildOptions.PROVIDED_MODULES_LIST_STEP)) {
           pluginsToPublish = new PluginsCollector(buildContext, providedModulesFilePath).collectCompatiblePluginsToPublish()
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
index cb35112fae29..51ed01169e7b 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
@@ -145,9 +145,7 @@ class DistributionJARsBuilder {
 
   List<String> getPlatformModules() {
     (platform.moduleJars.values() as List<String>) +
-    ["java-runtime", "platform-main", /*required to build searchable options index*/
-     "updater"] + buildContext.productProperties.productLayout.mainModules
-
+    ["java-runtime", "platform-main", /*required to build searchable options index*/ "updater"]
   }
 
   void buildJARs() {