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 e1be0a13c11b..bbad205b7547 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -109,7 +109,7 @@ public class CompileDriver {
   public static volatile boolean ourDebugMode = false;
 
   // 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)
+  private static final boolean OUT_OF_PROCESS_MAKE_AS_SERVER = true; // out-of-process make implementation switch (server / per-project build process)
   public static boolean runOutOfProcessMakeAsServer() {
     return OUT_OF_PROCESS_MAKE_AS_SERVER;
   }