diff --git a/build/scripts/dist.gant b/build/scripts/dist.gant
index 0d12051e7350..fcef33509bfe 100644
--- a/build/scripts/dist.gant
+++ b/build/scripts/dist.gant
@@ -57,7 +57,6 @@ setProperty("maySkipAndroidPlugin", true)
 
 target(compile: "Compile project") {
   loadProject()
-  bundledJDKs()
   projectBuilder.stage("Cleaning up sandbox folder")
   forceDelete(paths.sandbox)
 
@@ -67,6 +66,7 @@ target(compile: "Compile project") {
 
   projectBuilder.targetFolder = "$out/classes"
   projectBuilder.cleanOutput()
+  bundledJDKs()
   projectBuilder.buildProduction()
   projectBuilder.makeModuleTests(findModule("jps-builders"))
 }