diff --git a/build.xml b/build.xml
index 40c1d6390c4..feadab0b9b8 100644
--- a/build.xml
+++ b/build.xml
@@ -420,15 +420,6 @@
             </src>
         </new-kotlin2js>
 
-        <!-- TODO: it's a temporary hack, until IDEA indexer learns how to process this correctly -->
-        <delete file="${js.stdlib.output.dir}/tmp/kotlin/BaseOutput.kjsm"/>
-        <delete file="${js.stdlib.output.dir}/tmp/kotlin/BufferedOutput.kjsm"/>
-        <delete file="${js.stdlib.output.dir}/tmp/kotlin/BufferedOutputToConsoleLog.kjsm"/>
-        <delete file="${js.stdlib.output.dir}/tmp/kotlin/NodeJsOutput.kjsm"/>
-        <delete file="${js.stdlib.output.dir}/tmp/kotlin/OutputToConsoleLog.kjsm"/>
-        <delete file="${js.stdlib.output.dir}/tmp/kotlin/PropertyMetadata.kjsm"/>
-        <!-- -->
-
         <move file="${js.stdlib.output.dir}/tmp-builtins/kotlin.js" tofile="${js.stdlib.output.dir}/builtins.js" />
         <move file="${js.stdlib.output.dir}/tmp/kotlin.js" tofile="${js.stdlib.output.dir}/${compiled.stdlib.js}" />
         <move file="${js.stdlib.output.dir}/tmp/kotlin" todir="${js.stdlib.output.dir}" />
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/JsMetaFileUtils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/JsMetaFileUtils.kt
index 5d10552f3a5..eacc1a027ab 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/JsMetaFileUtils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/js/JsMetaFileUtils.kt
@@ -57,7 +57,7 @@ object JsMetaFileUtils {
 
     private fun getPackageFqName(relPath: String): FqName {
         val pathToFile = relPath.substringAfter(VfsUtilCore.VFS_SEPARATOR_CHAR)
-        if (isDefaultPackageMetafile(pathToFile)) return FqName.ROOT
+        if (isDefaultPackageMetafile(pathToFile) || !pathToFile.contains(VfsUtilCore.VFS_SEPARATOR_CHAR)) return FqName.ROOT
 
         val name = pathToFile.substringBeforeLast(VfsUtilCore.VFS_SEPARATOR_CHAR)
         return FqName(name.replace(VfsUtilCore.VFS_SEPARATOR_CHAR, '.'))