diff --git a/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java b/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java
index efc629a9d92b..3091e76e83d9 100644
--- a/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/CompileServerManager.java
@@ -164,7 +164,7 @@ public class CompileServerManager implements ApplicationComponent{
       }
 
       private boolean shouldTriggerMake(List<? extends VFileEvent> events) {
-        if (!CompileDriver.OUT_OF_PROCESS_MAKE_AS_SERVER) {
+        if (!CompileDriver.runOutOfProcessMakeAsServer()) {
           return false;
         }
         for (VFileEvent event : events) {
diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index e36e86e57277..e1be0a13c11b 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -107,7 +107,12 @@ public class CompileDriver {
   private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.impl.CompileDriver");
   // to be used in tests only for debug output
   public static volatile boolean ourDebugMode = false;
-  public static final boolean OUT_OF_PROCESS_MAKE_AS_SERVER = true; // out-of-process make implementation switch (server / per-project build process)
+
+  // todo: temp option
+  private static final boolean OUT_OF_PROCESS_MAKE_AS_SERVER = false; // out-of-process make implementation switch (server / per-project build process)
+  public static boolean runOutOfProcessMakeAsServer() {
+    return OUT_OF_PROCESS_MAKE_AS_SERVER;
+  }
 
   private final Project myProject;
   private final Map<Pair<IntermediateOutputCompiler, Module>, Pair<VirtualFile, VirtualFile>> myGenerationCompilerModuleToOutputDirMap; // [IntermediateOutputCompiler, Module] -> [ProductionSources, TestSources]
diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index 836244ded342..849fcbcef39a 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -178,7 +178,7 @@ public class BuildManager implements ApplicationComponent{
       }
 
       private boolean shouldTriggerMake(List<? extends VFileEvent> events) {
-        if (CompileDriver.OUT_OF_PROCESS_MAKE_AS_SERVER) {
+        if (CompileDriver.runOutOfProcessMakeAsServer()) {
           return false;
         }
         for (VFileEvent event : events) {