diff --git a/.idea/misc.xml b/.idea/misc.xml
index 32521f39d50..49b192df7a8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -66,7 +66,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="PsiViewerSettings">
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/README.md b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/README.md
index 400d46e2db1..d45277afeb9 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/README.md
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/scripting/gradle/README.md
@@ -54,7 +54,7 @@ Note that we can provide custom scripting support only for projects that using G
 
 ## Watching files states across IntelliJ restarts
 
-To have consistent sate of scripts, we should also be aware of external script changes. This is achieved by watching files using the IntelliJ VFS events. [GradleScriptInputsWatcher] is responsible for that.
+To have consistent sate of scripts, we should also be aware of external script changes. This is achieved by watching files using the IntelliJ VFS events. [GradleScriptListener] is responsible for that.
 
 The first tricky part is that scripts are depending on each other: so, when one script is changed, we actually should invalidate all other scripts as we don't know dependencies between them (Gradle will provide this information later, but it is not yet implemented). Actually, we should know the last modified timestamp of all scripts excepting a particular one. This can be achieved by storing timestamps of two last modified files. [LastModifiedFiles] utility is responsible for that.
 
diff --git a/idea/resources/META-INF/gradle.xml b/idea/resources/META-INF/gradle.xml
index 5687dd29a3c..0fe0e582dd8 100644
--- a/idea/resources/META-INF/gradle.xml
+++ b/idea/resources/META-INF/gradle.xml
@@ -36,8 +36,6 @@
                      This setting currently affects only HMPP projects. You may need to delete existing test configurations for the change to take place."
                      defaultValue="true"
                      restartRequired="false"/>
-
-        <projectService serviceImplementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcher"/>
     </extensions>
 
     <actions>
diff --git a/idea/resources/META-INF/gradle.xml.201 b/idea/resources/META-INF/gradle.xml.201
index 7b0b029b1fc..b6e93cff310 100644
--- a/idea/resources/META-INF/gradle.xml.201
+++ b/idea/resources/META-INF/gradle.xml.201
@@ -39,8 +39,6 @@
                      This setting currently affects only HMPP projects. You may need to delete existing test configurations for the change to take place."
                      defaultValue="true"
                      restartRequired="false"/>
-
-        <projectService serviceImplementation="org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcher"/>
     </extensions>
 
     <actions>
diff --git a/tests/mute-platform.csv.201 b/tests/mute-platform.csv.201
index 7a5a6c3b748..47c4abb92d2 100644
--- a/tests/mute-platform.csv.201
+++ b/tests/mute-platform.csv.201
@@ -215,13 +215,6 @@ org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.
 org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testToFunParameter, KT-34542, FAIL,
 org.jetbrains.kotlin.idea.resolve.ReferenceResolveInLibrarySourcesTestGenerated.testToLocalFun, KT-34542, FAIL,
 org.jetbrains.kotlin.idea.script.ScriptConfigurationHighlightingTestGenerated.Highlighting.testCustomJavaHome, No Java,,
-org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcherTest.testChangeInsideNonKtsFileInvalidatesOtherFiles, Assert: some script configuration loading tasks should be scheduled,,
-org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcherTest.testChangeInsideSectionsInvalidatesOtherFiles, Assert: some script configuration loading tasks should be scheduled,,
-org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcherTest.testChangeOutsideSectionsInvalidatesOtherFiles, Assert: some script configuration loading tasks should be scheduled,,
-org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcherTest.testConfigurationUpdateAfterProjectClosing, Assert: some script configuration loading tasks should be scheduled,,
-org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcherTest.testFileAttributesUpdateAfterChangeOutsideSectionsOfOtherFile, Assert: some script configuration loading tasks should be scheduled,,
-org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcherTest.testLoadedConfigurationWhenExternalFileChanged, Assert: some script configuration loading tasks should be scheduled,,
-org.jetbrains.kotlin.idea.scripting.gradle.GradleScriptInputsWatcherTest.testTwoFilesChanged, Assert: some script configuration loading tasks should be scheduled,,
 org.jetbrains.kotlin.idea.slicer.SlicerLeafGroupingTestGenerated.testSecondaryConstructorParameter, IDEA-234737 element.parent must not be null,,
 org.jetbrains.kotlin.idea.slicer.SlicerLeafGroupingTestGenerated.testSecondaryConstructorParameterWithDefault, IDEA-234737 element.parent must not be null,,
 org.jetbrains.kotlin.idea.slicer.SlicerNullnessGroupingTestGenerated.testSecondaryConstructorParameter, IDEA-234737 element.parent must not be null,,