diff --git a/build.xml b/build.xml
index 29460f55ac2..037b520e17b 100644
--- a/build.xml
+++ b/build.xml
@@ -862,7 +862,7 @@
     </target>
 
     <target name="stdlib">
-        <new-kotlinc output="${output}/classes/stdlib" moduleName="kotlin-stdlib" additionalOptions="-Xmultifile-facades-open">
+        <new-kotlinc output="${output}/classes/stdlib" moduleName="kotlin-stdlib">
             <src>
                 <include name="libraries/stdlib/src"/>
             </src>
diff --git a/libraries/stdlib/pom.xml b/libraries/stdlib/pom.xml
index c872823f663..fdd3909b08a 100644
--- a/libraries/stdlib/pom.xml
+++ b/libraries/stdlib/pom.xml
@@ -39,7 +39,6 @@
 
                  <configuration>
                      <args>
-                         <arg>-Xmultifile-facades-open</arg>
                          <arg>-Xallow-kotlin-package</arg>
                      </args>
                  </configuration>
diff --git a/libraries/stdlib/src/kotlin/ArraysKt.java b/libraries/stdlib/src/kotlin/ArraysKt.java
deleted file mode 100644
index 35032f6c1cf..00000000000
--- a/libraries/stdlib/src/kotlin/ArraysKt.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package kotlin;
-
-@java.lang.Deprecated
-@kotlin.Deprecated(message = "Use kotlin.collections.ArraysKt instead", level = DeprecationLevel.HIDDEN)
-public class ArraysKt extends kotlin.collections.ArraysKt {
-}
-
diff --git a/libraries/stdlib/src/kotlin/CharsKt.java b/libraries/stdlib/src/kotlin/CharsKt.java
deleted file mode 100644
index 706decdae58..00000000000
--- a/libraries/stdlib/src/kotlin/CharsKt.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin;
-
-@java.lang.Deprecated
-@Deprecated(message = "Use kotlin.text.CharsKt instead", level = DeprecationLevel.HIDDEN)
-public class CharsKt extends kotlin.text.CharsKt {
-}
diff --git a/libraries/stdlib/src/kotlin/CollectionsKt.java b/libraries/stdlib/src/kotlin/CollectionsKt.java
deleted file mode 100644
index 32459cbf019..00000000000
--- a/libraries/stdlib/src/kotlin/CollectionsKt.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package kotlin;
-
-@java.lang.Deprecated
-@kotlin.Deprecated(message = "Use kotlin.collections.CollectionsKt instead", level = DeprecationLevel.HIDDEN)
-public class CollectionsKt extends kotlin.collections.CollectionsKt {
-}
diff --git a/libraries/stdlib/src/kotlin/MapsKt.java b/libraries/stdlib/src/kotlin/MapsKt.java
deleted file mode 100644
index 996d2324c4a..00000000000
--- a/libraries/stdlib/src/kotlin/MapsKt.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin;
-
-@java.lang.Deprecated
-@Deprecated(message = "Use kotlin.collections.MapsKt instead", level = DeprecationLevel.HIDDEN)
-public class MapsKt extends kotlin.collections.MapsKt {
-}
diff --git a/libraries/stdlib/src/kotlin/RangesKt.java b/libraries/stdlib/src/kotlin/RangesKt.java
deleted file mode 100644
index 2de2f6b01bf..00000000000
--- a/libraries/stdlib/src/kotlin/RangesKt.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin;
-
-@java.lang.Deprecated
-@Deprecated(message = "Use kotlin.ranges.RangesKt instead", level = DeprecationLevel.HIDDEN)
-public class RangesKt extends kotlin.ranges.RangesKt {
-}
diff --git a/libraries/stdlib/src/kotlin/SequencesKt.java b/libraries/stdlib/src/kotlin/SequencesKt.java
deleted file mode 100644
index 5c9a02d2c62..00000000000
--- a/libraries/stdlib/src/kotlin/SequencesKt.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin;
-
-@java.lang.Deprecated
-@Deprecated(message = "Use kotlin.sequences.SequencesKt instead", level = DeprecationLevel.HIDDEN)
-public class SequencesKt extends kotlin.sequences.SequencesKt {
-}
diff --git a/libraries/stdlib/src/kotlin/SetsKt.java b/libraries/stdlib/src/kotlin/SetsKt.java
deleted file mode 100644
index 0f24e0312d9..00000000000
--- a/libraries/stdlib/src/kotlin/SetsKt.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin;
-
-@java.lang.Deprecated
-@Deprecated(message = "Use kotlin.collections.SetsKt instead", level = DeprecationLevel.HIDDEN)
-public class SetsKt extends kotlin.collections.SetsKt {
-}
diff --git a/libraries/stdlib/src/kotlin/StringsKt.java b/libraries/stdlib/src/kotlin/StringsKt.java
deleted file mode 100644
index 0b4d6c3f2f6..00000000000
--- a/libraries/stdlib/src/kotlin/StringsKt.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package kotlin;
-
-@java.lang.Deprecated
-@Deprecated(message = "Use kotlin.text.StringsKt instead", level = DeprecationLevel.HIDDEN)
-public class StringsKt extends kotlin.text.StringsKt {
-}