Revert "Optionally make java executable path contribute to the daemon id."

This reverts commit ac86ad252f.

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/DaemonParams.kt

@@ -231,36 +231,15 @@ fun ByteArray.toHexString(): String = joinToString("", transform = { "%02x".form
 
 data class CompilerId(
         var compilerClasspath: List<String> = listOf(),
-        var compilerVersion: String = "",
-        var javaExecutable: File? = null
+        var compilerVersion: String = ""
 ) : OptionsGroup {
 
     override val mappers: List<PropMapper<*, *, *>>
-        get() = listOf(
-            PropMapper(
-                dest = this,
-                prop = CompilerId::compilerClasspath,
-                toString = { it.joinToString(File.pathSeparator) },
-                fromString = { it.trimQuotes().split(File.pathSeparator) }
-            ),
-            StringPropMapper(
-                dest = this,
-                prop = CompilerId::compilerVersion
-            ),
-            PropMapper(
-                dest = this,
-                prop = CompilerId::javaExecutable,
-                toString = { it?.absolutePath },
-                fromString = { File(it.trimQuotes()) },
-                skipIf = { it == null }
-            )
-        )
+        get() = listOf(PropMapper(this, CompilerId::compilerClasspath, toString = { it.joinToString(File.pathSeparator) }, fromString = { it.trimQuotes().split(File.pathSeparator) }),
+                       StringPropMapper(this, CompilerId::compilerVersion))
 
     fun digest(): String = compilerClasspath
         .map { File(it).absolutePath }
-        .run {
-            javaExecutable?.let { plus(it.absolutePath) } ?: this
-        }
         .distinctStringsDigest()
         .toHexString()
 
@@ -271,15 +250,6 @@ data class CompilerId(
         @JvmStatic
         fun makeCompilerId(paths: Iterable<File>): CompilerId =
                 CompilerId(compilerClasspath = paths.map { it.absolutePath })
-
-        @JvmStatic
-        fun makeCompilerId(
-            paths: Iterable<File>,
-            javaExecutable: File
-        ): CompilerId = CompilerId(
-            compilerClasspath = paths.map { it.absolutePath },
-            javaExecutable = javaExecutable
-        )
     }
 }