diff --git a/python/build/pycharm_build.gant b/python/build/pycharm_build.gant
index 7709e90dbf9f..1a2103d42f1a 100644
--- a/python/build/pycharm_build.gant
+++ b/python/build/pycharm_build.gant
@@ -1,4 +1,4 @@
-import org.jetbrains.jps.LayoutInfo
+  import org.jetbrains.jps.LayoutInfo
 
 import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome
 
@@ -164,7 +164,7 @@ private communityEdition(Set usedJars) {
   Script s = groovyShell.parse(new File("$pythonCommunityHome/build/pycharm_community_build.gant"))
   s.setBinding(binding)
 
-  s.layoutCommunity(usedJars)
+  s.layoutCommunity("${paths.sandbox}/classes/production", usedJars)
 
   // todo: get rid of copying
   //ant.copy(file: "$paths.artifacts/ideaIC-${buildNumber}.mac.zip", tofile: "$paths.artifacts/ideaIC-${buildNumber}.sit")
diff --git a/python/build/pycharm_community_build.gant b/python/build/pycharm_community_build.gant
index e245ca7e31e5..e99cb84df771 100644
--- a/python/build/pycharm_community_build.gant
+++ b/python/build/pycharm_community_build.gant
@@ -109,7 +109,7 @@ target('default': "Build artifacts") {
   def approvedJars = ["$normalizedHome/lib/", "$normalizedPythonHome/lib/", "$normalizedHome/xml/relaxng/lib/"]
   def usedJars = buildModulesAndCollectUsedJars(modules, approvedJars, ["/ant/"])
 
-  layoutCommunity(usedJars)
+  layoutCommunity("${paths.sandbox}/classes/production", usedJars)
 
 
   buildWinZip("${paths.artifacts}/pycharm${buildName}.zip", [paths.distAll, paths.distWin])
@@ -125,7 +125,8 @@ target('default': "Build artifacts") {
   */
 }
 
-public layoutCommunity(Set usedJars) {
+public layoutCommunity(String classesPath, Set usedJars) {
+  def appInfo = appInfoFile(classesPath)
   def paths = new Paths(home)
   buildSearchableOptions("${projectBuilder.moduleOutput(findModule("platform-resources"))}/search", [], {
     projectBuilder.moduleRuntimeClasspath(findModule("main_pycharm_ce"), false).each {
@@ -134,7 +135,7 @@ public layoutCommunity(Set usedJars) {
   }, "-Didea.platform.prefix=PyCharmCore -Didea.no.jre.check=true")
 
   if (!dryRun) {
-    wireBuildDate(buildName, appInfoFile())
+    wireBuildDate(buildName, appInfo)
   }
 
   Map args = [
@@ -161,7 +162,7 @@ public layoutCommunity(Set usedJars) {
     "$home/community/platform/icons/src",
     "$pythonCommunityHome/resources"]
   buildWinLauncher("$ch", "$ch/bin/WinLauncher/WinLauncher.exe", launcher,
-                   appInfoFile(), "$pythonCommunityHome/build/pycharm_community_launcher.properties", system_selector, resourcePaths)
+                   appInfo, "$pythonCommunityHome/build/pycharm_community_launcher.properties", system_selector, resourcePaths)
 
   String tarRoot = isEap() ? "pycharm-community-$buildNumber" : "pycharm-community-${p("component.version.major")}.${p("component.version.minor")}"
   buildTarGz(tarRoot, "$paths.artifacts/pycharm${buildName}.tar", [paths.distAll, paths.distUnix])
@@ -213,8 +214,8 @@ private layoutPlugins(layouts) {
   layouts.layoutPlugins()
 }
 
-private String appInfoFile() {
-  return "$home/out/pycharmCE/classes/production/python-community/idea/PyCharmCoreApplicationInfo.xml"
+private String appInfoFile(String classesPath) {
+  return "$classesPath/python-community/idea/PyCharmCoreApplicationInfo.xml"
 }
 
 private layoutFull(Map args, String target, Set usedJars) {