diff --git a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
index 5663f6937fb..91930e4c5fc 100644
--- a/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
+++ b/compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
@@ -140,8 +140,7 @@ interface CompileService : Remote {
             targetPlatform: TargetPlatform,
             compilerArguments: CommonCompilerArguments,
             additionalCompilerArguments: AdditionalCompilerArguments,
-            servicesFacade: CompilerServicesFacadeBase,
-            operationsTracer: RemoteOperationsTracer?
+            servicesFacade: CompilerServicesFacadeBase
     ): CallResult<Int>
 
     @Throws(RemoteException::class)
diff --git a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
index 4f582924ec4..6e30028500f 100644
--- a/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+++ b/compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
@@ -327,8 +327,7 @@ class CompileServiceImpl(
             targetPlatform: CompileService.TargetPlatform,
             compilerArguments: CommonCompilerArguments,
             additionalCompilerArguments: AdditionalCompilerArguments,
-            servicesFacade: CompilerServicesFacadeBase,
-            operationsTracer: RemoteOperationsTracer?
+            servicesFacade: CompilerServicesFacadeBase
     ): CompileService.CallResult<Int> {
         val messageCollector = CompileServicesFacadeMessageCollector(servicesFacade, additionalCompilerArguments)
         val serviceReporter = CompileServiceReporterImpl(servicesFacade, additionalCompilerArguments)
@@ -337,13 +336,13 @@ class CompileServiceImpl(
             CompileService.CompilerMode.JPS_COMPILER -> {
                 val jpsServicesFacade = servicesFacade as JpsCompilerServicesFacade
 
-                doCompile(sessionId, serviceReporter, operationsTracer) { eventManger, profiler ->
+                doCompile(sessionId, serviceReporter, tracer = null) { eventManger, profiler ->
                     val services = createCompileServices(jpsServicesFacade, eventManger, profiler)
                     execCompiler(targetPlatform, services, compilerArguments, messageCollector)
                 }
             }
             CompileService.CompilerMode.NON_INCREMENTAL_COMPILER -> {
-                doCompile(sessionId, serviceReporter, operationsTracer) { eventManger, profiler ->
+                doCompile(sessionId, serviceReporter, tracer = null) { eventManger, profiler ->
                     execCompiler(targetPlatform, Services.EMPTY, compilerArguments, messageCollector)
                 }
             }
@@ -357,7 +356,7 @@ class CompileServiceImpl(
                 val gradleIncrementalServicesFacade = servicesFacade as IncrementalCompilerServicesFacade
 
                 withIC {
-                    doCompile(sessionId, serviceReporter, operationsTracer) { eventManger, profiler ->
+                    doCompile(sessionId, serviceReporter, tracer = null) { eventManger, profiler ->
                         execIncrementalCompiler(k2jvmArgs, gradleIncrementalArgs, gradleIncrementalServicesFacade, messageCollector)
                     }
                 }
@@ -678,11 +677,11 @@ class CompileServiceImpl(
 
     private fun doCompile(sessionId: Int,
                           compileServiceReporter: CompileServiceReporter,
-                          operationsTracer: RemoteOperationsTracer?,
+                          tracer: RemoteOperationsTracer?,
                           body: (EventManger, Profiler) -> ExitCode): CompileService.CallResult<Int> =
             ifAlive {
                 withValidClientOrSessionProxy(sessionId) { session ->
-                    operationsTracer?.before("compile")
+                    tracer?.before("compile")
                     val rpcProfiler = if (daemonOptions.reportPerf) WallAndThreadTotalProfiler() else DummyProfiler()
                     val eventManger = EventMangerImpl()
                     try {
@@ -693,7 +692,7 @@ class CompileServiceImpl(
                     }
                     finally {
                         eventManger.fireCompilationFinished()
-                        operationsTracer?.after("compile")
+                        tracer?.after("compile")
                     }
                 }
             }
diff --git a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
index 8ccff1964fa..4458bb65141 100644
--- a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
+++ b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
@@ -105,8 +105,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
                     targetPlatform,
                     compilerArgs,
                     AdditionalCompilerArguments(reportingFilters = getReportingFilters(compilerArgs.verbose)),
-                    JpsCompilerServicesFacadeImpl(environment),
-                    operationsTracer = null)
+                    JpsCompilerServicesFacadeImpl(environment))
         }
 
         return res?.get()?.let { exitCodeFromProcessExitCode(it) }
diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
index 29abfe16ddf..4fb63650cab 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
@@ -170,8 +170,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
                     targetPlatform,
                     environment.compilerArgs,
                     AdditionalCompilerArguments(reportingFilters = getNonIncrementalReportingFilters(environment.compilerArgs.verbose)),
-                    GradleCompilerServicesFacadeImpl(project, environment.messageCollector),
-                    operationsTracer = null)
+                    GradleCompilerServicesFacadeImpl(project, environment.messageCollector))
         }
 
         val exitCode = res?.get()?.let { exitCodeFromProcessExitCode(it) }
@@ -202,8 +201,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
                     CompileService.TargetPlatform.JVM,
                     environment.compilerArgs,
                     additionalCompilerArguments,
-                    GradleIncrementalCompilerServicesFacadeImpl(project, environment),
-                    operationsTracer = null)
+                    GradleIncrementalCompilerServicesFacadeImpl(project, environment))
         }
 
         val exitCode = res?.get()?.let { exitCodeFromProcessExitCode(it) }