diff --git a/libraries/stdlib/jdk7/test/internalAnnotations.kt b/libraries/stdlib/jdk7/test/internalAnnotations.kt
deleted file mode 100644
index 9a1b933f996..00000000000
--- a/libraries/stdlib/jdk7/test/internalAnnotations.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2017 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.
- */
-
-@file:JvmVersion
-package kotlin.jvm
-
-@Target(AnnotationTarget.FILE, AnnotationTarget.CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class JvmVersion(public val minimum: Int = 6, public val maximum: Int = 100)
diff --git a/libraries/stdlib/jre7/test/internalAnnotations.kt b/libraries/stdlib/jre7/test/internalAnnotations.kt
deleted file mode 100644
index 9a1b933f996..00000000000
--- a/libraries/stdlib/jre7/test/internalAnnotations.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2010-2017 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.
- */
-
-@file:JvmVersion
-package kotlin.jvm
-
-@Target(AnnotationTarget.FILE, AnnotationTarget.CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class JvmVersion(public val minimum: Int = 6, public val maximum: Int = 100)
diff --git a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
index fff6468f05e..b3635be0234 100644
--- a/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
+++ b/libraries/stdlib/jvm-minimal-for-test/build.gradle.kts
@@ -22,15 +22,14 @@ sourceSets {
     "test" {}
 }
 
-val copySources by task<Copy> {
+val copySources by task<Sync> {
     val stdlibProjectDir = project(":kotlin-stdlib").projectDir
 
     from(stdlibProjectDir.resolve("runtime"))
         .include("kotlin/TypeAliases.kt",
                  "kotlin/text/TypeAliases.kt")
     from(stdlibProjectDir.resolve("src"))
-        .include("kotlin/collections/TypeAliases.kt",
-                 "kotlin/jvm/JvmVersion.kt")
+        .include("kotlin/collections/TypeAliases.kt")
     from(stdlibProjectDir.resolve("../src"))
         .include("kotlin/util/Standard.kt",
                  "kotlin/internal/Annotations.kt",
diff --git a/libraries/stdlib/jvm/src/generated/_ArraysJvm.kt b/libraries/stdlib/jvm/src/generated/_ArraysJvm.kt
index a4307307ae7..30d0ad145ac 100644
--- a/libraries/stdlib/jvm/src/generated/_ArraysJvm.kt
+++ b/libraries/stdlib/jvm/src/generated/_ArraysJvm.kt
@@ -1,6 +1,5 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("ArraysKt")
-@file:kotlin.jvm.JvmVersion
 
 package kotlin.collections
 
diff --git a/libraries/stdlib/jvm/src/generated/_CollectionsJvm.kt b/libraries/stdlib/jvm/src/generated/_CollectionsJvm.kt
index 7dfddca8092..ef4a0287daf 100644
--- a/libraries/stdlib/jvm/src/generated/_CollectionsJvm.kt
+++ b/libraries/stdlib/jvm/src/generated/_CollectionsJvm.kt
@@ -1,6 +1,5 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("CollectionsKt")
-@file:kotlin.jvm.JvmVersion
 
 package kotlin.collections
 
diff --git a/libraries/stdlib/jvm/src/generated/_ComparisonsJvm.kt b/libraries/stdlib/jvm/src/generated/_ComparisonsJvm.kt
index 6920f23e745..9dbd8ca29f5 100644
--- a/libraries/stdlib/jvm/src/generated/_ComparisonsJvm.kt
+++ b/libraries/stdlib/jvm/src/generated/_ComparisonsJvm.kt
@@ -1,6 +1,5 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("ComparisonsKt")
-@file:kotlin.jvm.JvmVersion
 
 package kotlin.comparisons
 
diff --git a/libraries/stdlib/jvm/src/generated/_SequencesJvm.kt b/libraries/stdlib/jvm/src/generated/_SequencesJvm.kt
index 0364f6d3d0c..bca7d491c18 100644
--- a/libraries/stdlib/jvm/src/generated/_SequencesJvm.kt
+++ b/libraries/stdlib/jvm/src/generated/_SequencesJvm.kt
@@ -1,6 +1,5 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("SequencesKt")
-@file:kotlin.jvm.JvmVersion
 
 package kotlin.sequences
 
diff --git a/libraries/stdlib/jvm/src/generated/_StringsJvm.kt b/libraries/stdlib/jvm/src/generated/_StringsJvm.kt
index 36707d60fa0..649d84b5578 100644
--- a/libraries/stdlib/jvm/src/generated/_StringsJvm.kt
+++ b/libraries/stdlib/jvm/src/generated/_StringsJvm.kt
@@ -1,6 +1,5 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("StringsKt")
-@file:kotlin.jvm.JvmVersion
 
 package kotlin.text
 
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableCollection.kt b/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableCollection.kt
index a06c8772931..a10453a5208 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableCollection.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableCollection.kt
@@ -3,7 +3,6 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-@file:JvmVersion
 package kotlin.collections
 
 import java.util.AbstractCollection
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableList.kt b/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableList.kt
index 5f53d035293..690d84f2b02 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableList.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableList.kt
@@ -3,7 +3,6 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-@file:JvmVersion
 package kotlin.collections
 
 import java.util.AbstractList
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableMap.kt b/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableMap.kt
index a550acac360..ca881cb7d33 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableMap.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableMap.kt
@@ -3,7 +3,6 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-@file:JvmVersion
 package kotlin.collections
 
 import java.util.AbstractMap
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableSet.kt b/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableSet.kt
index cb82ec804a7..d248b2bb5a4 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableSet.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/AbstractMutableSet.kt
@@ -3,7 +3,6 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-@file:JvmVersion
 package kotlin.collections
 
 import java.util.AbstractSet
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/ArraysJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/ArraysJVM.kt
index fe8608f4da3..f6ad8c6b2ff 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/ArraysJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/ArraysJVM.kt
@@ -5,7 +5,6 @@
 
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("ArraysKt")
-@file:kotlin.jvm.JvmVersion
 
 package kotlin.collections
 
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt
index 4e21073a99d..7df929aa279 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt
@@ -15,7 +15,6 @@ import kotlin.*
  * The returned list is serializable.
  * @sample samples.collections.Collections.Lists.singletonReadOnlyList
  */
-@JvmVersion
 public fun <T> listOf(element: T): List<T> = java.util.Collections.singletonList(element)
 
 
@@ -24,23 +23,19 @@ public fun <T> listOf(element: T): List<T> = java.util.Collections.singletonList
  * in the order they are returned by the enumeration.
  * @sample samples.collections.Collections.Lists.listFromEnumeration
  */
-@JvmVersion
 @kotlin.internal.InlineOnly
 public inline fun <T> java.util.Enumeration<T>.toList(): List<T> = java.util.Collections.list(this)
 
 
-@JvmVersion
 @kotlin.internal.InlineOnly
 internal actual inline fun copyToArrayImpl(collection: Collection<*>): Array<Any?> =
     kotlin.jvm.internal.collectionToArray(collection)
 
-@JvmVersion
 @kotlin.internal.InlineOnly
 internal actual inline fun <T> copyToArrayImpl(collection: Collection<*>, array: Array<T>): Array<T> =
     kotlin.jvm.internal.collectionToArray(collection, array as Array<Any?>) as Array<T>
 
 // copies typed varargs array to array of objects
-@JvmVersion
 internal actual fun <T> Array<out T>.copyToArrayOfAny(isVarargs: Boolean): Array<out Any?> =
     if (isVarargs && this.javaClass == Array<Any?>::class.java)
     // if the array came from varargs and already is array of Any, copying isn't required
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/GroupingJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/GroupingJVM.kt
index de41064ae7a..8b492d61c4a 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/GroupingJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/GroupingJVM.kt
@@ -17,7 +17,6 @@ package kotlin.collections
  * @sample samples.collections.Collections.Transformations.groupingByEachCount
  */
 @SinceKotlin("1.1")
-@JvmVersion
 public actual fun <T, K> Grouping<T, K>.eachCount(): Map<K, Int> =
 // fold(0) { acc, e -> acc + 1 } optimized for boxing
     foldTo(destination = mutableMapOf(),
@@ -32,7 +31,6 @@ public actual fun <T, K> Grouping<T, K>.eachCount(): Map<K, Int> =
  * @return a [Map] associating the key of each group with the sum of elements in the group.
  */
 @SinceKotlin("1.X")
-@JvmVersion
 public inline fun <T, K> Grouping<T, K>.eachSumOf(valueSelector: (T) -> Int): Map<K, Int> =
         // fold(0) { acc, e -> acc + valueSelector(e)} optimized for boxing
         foldTo( destination = mutableMapOf(),
@@ -43,7 +41,6 @@ public inline fun <T, K> Grouping<T, K>.eachSumOf(valueSelector: (T) -> Int): Ma
 
 
 
-@JvmVersion
 @PublishedApi
 @kotlin.internal.InlineOnly
 @Suppress("UNCHECKED_CAST") // tricks with erased generics go here, do not repeat on reified platforms
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/IteratorsJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/IteratorsJVM.kt
index dc56a0e32b4..7e455d5fcee 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/IteratorsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/IteratorsJVM.kt
@@ -12,7 +12,6 @@ package kotlin.collections
  * Creates an [Iterator] for an [java.util.Enumeration], allowing to use it in `for` loops.
  * @sample samples.collections.Iterators.iteratorForEnumeration
  */
-@kotlin.jvm.JvmVersion
 public operator fun <T> java.util.Enumeration<T>.iterator(): Iterator<T> = object : Iterator<T> {
     override fun hasNext(): Boolean = hasMoreElements()
 
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/MapsJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/MapsJVM.kt
index 8001b667d83..6d514aa282b 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/MapsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/MapsJVM.kt
@@ -1,6 +1,5 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("MapsKt")
-@file:kotlin.jvm.JvmVersion
 
 package kotlin.collections
 
@@ -20,7 +19,6 @@ import java.util.concurrent.ConcurrentMap
  *
  * @sample samples.collections.Maps.Instantiation.mapFromPairs
  */
-@JvmVersion
 public fun <K, V> mapOf(pair: Pair<K, V>): Map<K, V> = java.util.Collections.singletonMap(pair.first, pair.second)
 
 
@@ -78,12 +76,10 @@ public inline fun Map<String, String>.toProperties(): Properties
 
 
 // creates a singleton copy of map, if there is specialization available in target platform, otherwise returns itself
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 internal actual inline fun <K, V> Map<K, V>.toSingletonMapOrSelf(): Map<K, V> = toSingletonMap()
 
 // creates a singleton copy of map
-@kotlin.jvm.JvmVersion
 internal actual fun <K, V> Map<out K, V>.toSingletonMap(): Map<K, V>
         = with (entries.iterator().next()) { java.util.Collections.singletonMap(key, value) }
 
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/MutableCollectionsJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/MutableCollectionsJVM.kt
index 1899feda9d6..5fc774ea036 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/MutableCollectionsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/MutableCollectionsJVM.kt
@@ -10,13 +10,11 @@ package kotlin.collections
 
 
 @Deprecated("Use sortWith(comparator) instead.", ReplaceWith("this.sortWith(comparator)"), level = DeprecationLevel.ERROR)
-@JvmVersion
 @kotlin.internal.InlineOnly
 @Suppress("UNUSED_PARAMETER")
 public inline fun <T> MutableList<T>.sort(comparator: Comparator<in T>): Unit = throw NotImplementedError()
 
 @Deprecated("Use sortWith(Comparator(comparison)) instead.", ReplaceWith("this.sortWith(Comparator(comparison))"), level = DeprecationLevel.ERROR)
-@JvmVersion
 @kotlin.internal.InlineOnly
 @Suppress("UNUSED_PARAMETER")
 public inline fun <T> MutableList<T>.sort(comparison: (T, T) -> Int): Unit = throw NotImplementedError()
@@ -25,7 +23,6 @@ public inline fun <T> MutableList<T>.sort(comparison: (T, T) -> Int): Unit = thr
 /**
  * Sorts elements in the list in-place according to their natural sort order.
  */
-@kotlin.jvm.JvmVersion
 public actual fun <T : Comparable<T>> MutableList<T>.sort(): Unit {
     if (size > 1) java.util.Collections.sort(this)
 }
@@ -33,7 +30,6 @@ public actual fun <T : Comparable<T>> MutableList<T>.sort(): Unit {
 /**
  * Sorts elements in the list in-place according to the order specified with [comparator].
  */
-@kotlin.jvm.JvmVersion
 public actual fun <T> MutableList<T>.sortWith(comparator: Comparator<in T>): Unit {
     if (size > 1) java.util.Collections.sort(this, comparator)
 }
@@ -43,7 +39,6 @@ public actual fun <T> MutableList<T>.sortWith(comparator: Comparator<in T>): Uni
  *
  * Each element in the list gets replaced with the [value].
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 @SinceKotlin("1.2")
 public actual inline fun <T> MutableList<T>.fill(value: T) {
@@ -54,7 +49,6 @@ public actual inline fun <T> MutableList<T>.fill(value: T) {
 /**
  * Randomly shuffles elements in this mutable list.
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 @SinceKotlin("1.2")
 public actual inline fun <T> MutableList<T>.shuffle() {
@@ -64,7 +58,6 @@ public actual inline fun <T> MutableList<T>.shuffle() {
 /**
  * Randomly shuffles elements in this mutable list using the specified [random] instance as the source of randomness.
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 @SinceKotlin("1.2")
 public inline fun <T> MutableList<T>.shuffle(random: java.util.Random) {
@@ -74,7 +67,6 @@ public inline fun <T> MutableList<T>.shuffle(random: java.util.Random) {
 /**
  * Returns a new list with the elements of this list randomly shuffled.
  */
-@kotlin.jvm.JvmVersion
 @SinceKotlin("1.2")
 public actual fun <T> Iterable<T>.shuffled(): List<T> = toMutableList().apply { shuffle() }
 
@@ -82,6 +74,5 @@ public actual fun <T> Iterable<T>.shuffled(): List<T> = toMutableList().apply {
  * Returns a new list with the elements of this list randomly shuffled
  * using the specified [random] instance as the source of randomness.
  */
-@kotlin.jvm.JvmVersion
 @SinceKotlin("1.2")
 public fun <T> Iterable<T>.shuffled(random: java.util.Random): List<T> = toMutableList().apply { shuffle(random) }
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/SequencesJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/SequencesJVM.kt
index b4c2515a646..6dadde6df27 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/SequencesJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/SequencesJVM.kt
@@ -14,12 +14,10 @@ import kotlin.*
  * Creates a sequence that returns all values from this enumeration. The sequence is constrained to be iterated only once.
  * @sample samples.collections.Sequences.Building.sequenceFromEnumeration
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public inline fun<T> java.util.Enumeration<T>.asSequence(): Sequence<T> = this.iterator().asSequence()
 
 
-@kotlin.jvm.JvmVersion
 internal actual class ConstrainedOnceSequence<T> actual constructor(sequence: Sequence<T>) : Sequence<T> {
     private val sequenceRef = java.util.concurrent.atomic.AtomicReference(sequence)
 
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/SetsJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/SetsJVM.kt
index 9c3faa6cd7f..5854c85a3ed 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/SetsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/SetsJVM.kt
@@ -13,19 +13,16 @@ package kotlin.collections
  * Returns an immutable set containing only the specified object [element].
  * The returned set is serializable.
  */
-@JvmVersion
 public fun <T> setOf(element: T): Set<T> = java.util.Collections.singleton(element)
 
 
 /**
  * Returns a new [java.util.SortedSet] with the given elements.
  */
-@JvmVersion
 public fun <T> sortedSetOf(vararg elements: T): java.util.TreeSet<T> = elements.toCollection(java.util.TreeSet<T>())
 
 /**
  * Returns a new [java.util.SortedSet] with the given [comparator] and elements.
  */
-@JvmVersion
 public fun <T> sortedSetOf(comparator: Comparator<in T>, vararg elements: T): java.util.TreeSet<T> = elements.toCollection(java.util.TreeSet<T>(comparator))
 
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/TypeAliases.kt b/libraries/stdlib/jvm/src/kotlin/collections/TypeAliases.kt
index 8b5e3fa14f1..b3226b6f758 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/TypeAliases.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/TypeAliases.kt
@@ -1,5 +1,3 @@
-@file:kotlin.jvm.JvmVersion
-
 @file:Suppress("ACTUAL_WITHOUT_EXPECT") // for building kotlin-stdlib-minimal-for-test
 
 package kotlin.collections
diff --git a/libraries/stdlib/jvm/src/kotlin/concurrent/Locks.kt b/libraries/stdlib/jvm/src/kotlin/concurrent/Locks.kt
index 51e037000b6..a1d448f18a7 100644
--- a/libraries/stdlib/jvm/src/kotlin/concurrent/Locks.kt
+++ b/libraries/stdlib/jvm/src/kotlin/concurrent/Locks.kt
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-@file:JvmVersion
 @file:JvmName("LocksKt")
 package kotlin.concurrent
 
diff --git a/libraries/stdlib/jvm/src/kotlin/concurrent/Thread.kt b/libraries/stdlib/jvm/src/kotlin/concurrent/Thread.kt
index 276bd93738b..f4f55884c95 100644
--- a/libraries/stdlib/jvm/src/kotlin/concurrent/Thread.kt
+++ b/libraries/stdlib/jvm/src/kotlin/concurrent/Thread.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 @file:JvmName("ThreadsKt")
 package kotlin.concurrent
 
diff --git a/libraries/stdlib/jvm/src/kotlin/concurrent/Timer.kt b/libraries/stdlib/jvm/src/kotlin/concurrent/Timer.kt
index 32b3b808244..953faafbd7e 100644
--- a/libraries/stdlib/jvm/src/kotlin/concurrent/Timer.kt
+++ b/libraries/stdlib/jvm/src/kotlin/concurrent/Timer.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 @file:JvmName("TimersKt")
 package kotlin.concurrent
 
diff --git a/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt
index cc9a6c4e506..da690b40674 100644
--- a/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt
+++ b/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/SafeContinuationJvm.kt
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:kotlin.jvm.JvmVersion
 package kotlin.coroutines.experimental
 
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater
diff --git a/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/intrinsics/IntrinsicsJvm.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/intrinsics/IntrinsicsJvm.kt
index ba079f7755d..d21f0219c1f 100644
--- a/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/intrinsics/IntrinsicsJvm.kt
+++ b/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/intrinsics/IntrinsicsJvm.kt
@@ -16,7 +16,6 @@
 
 @file:kotlin.jvm.JvmName("IntrinsicsKt")
 @file:kotlin.jvm.JvmMultifileClass
-@file:kotlin.jvm.JvmVersion
 package kotlin.coroutines.experimental.intrinsics
 import kotlin.coroutines.experimental.*
 
@@ -63,7 +62,6 @@ public actual inline fun <R, T> (suspend R.() -> T).startCoroutineUninterceptedO
  * state machine of the coroutine and may result in arbitrary behaviour or exception.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 public actual fun <T> (suspend () -> T).createCoroutineUnchecked(
         completion: Continuation<T>
 ): Continuation<Unit> =
@@ -86,7 +84,6 @@ public actual fun <T> (suspend () -> T).createCoroutineUnchecked(
  * state machine of the coroutine and may result in arbitrary behaviour or exception.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 public actual fun <R, T> (suspend R.() -> T).createCoroutineUnchecked(
         receiver: R,
         completion: Continuation<T>
@@ -101,7 +98,6 @@ public actual fun <R, T> (suspend R.() -> T).createCoroutineUnchecked(
 
 // INTERNAL DEFINITIONS
 
-@kotlin.jvm.JvmVersion
 private inline fun <T> buildContinuationByInvokeCall(
         completion: Continuation<T>,
         crossinline block: () -> Any?
diff --git a/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/jvm/internal/CoroutineImpl.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/jvm/internal/CoroutineImpl.kt
index f8f9964ded3..5d7ef829aed 100644
--- a/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/jvm/internal/CoroutineImpl.kt
+++ b/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/jvm/internal/CoroutineImpl.kt
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-@file:JvmVersion
 package kotlin.coroutines.experimental.jvm.internal
 
 import java.lang.IllegalStateException
diff --git a/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/jvm/internal/CoroutineIntrinsics.kt b/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/jvm/internal/CoroutineIntrinsics.kt
index d3170fd094a..2c9251dd78f 100644
--- a/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/jvm/internal/CoroutineIntrinsics.kt
+++ b/libraries/stdlib/jvm/src/kotlin/coroutines/experimental/jvm/internal/CoroutineIntrinsics.kt
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-@file:JvmVersion
 @file:JvmName("CoroutineIntrinsics")
 package kotlin.coroutines.experimental.jvm.internal
 
diff --git a/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt b/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt
index 143140f0ae8..84414fd5871 100644
--- a/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt
+++ b/libraries/stdlib/jvm/src/kotlin/internal/PlatformImplementations.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 package kotlin.internal
 
 import kotlin.*
diff --git a/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt b/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt
index ba02b69a753..487ac39987b 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/Closeable.kt
@@ -15,7 +15,6 @@
  */
 
 @file:JvmName("CloseableKt")
-@file:JvmVersion
 package kotlin.io
 
 import java.io.Closeable
diff --git a/libraries/stdlib/jvm/src/kotlin/io/Console.kt b/libraries/stdlib/jvm/src/kotlin/io/Console.kt
index 06a3fd5471f..b665ab18f76 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/Console.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/Console.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 @file:JvmName("ConsoleKt")
 
 package kotlin.io
diff --git a/libraries/stdlib/jvm/src/kotlin/io/Constants.kt b/libraries/stdlib/jvm/src/kotlin/io/Constants.kt
index 812a598f50d..fd2593a1142 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/Constants.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/Constants.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 @file:JvmName("ConstantsKt")
 package kotlin.io
 
diff --git a/libraries/stdlib/jvm/src/kotlin/io/Exceptions.kt b/libraries/stdlib/jvm/src/kotlin/io/Exceptions.kt
index 1668a53498c..c990e59cfdd 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/Exceptions.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/Exceptions.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 package kotlin.io
 
 import kotlin.text.*
diff --git a/libraries/stdlib/jvm/src/kotlin/io/FileReadWrite.kt b/libraries/stdlib/jvm/src/kotlin/io/FileReadWrite.kt
index 2bd47200ce7..3a51df81695 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/FileReadWrite.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/FileReadWrite.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 @file:JvmMultifileClass
 @file:JvmName("FilesKt")
 package kotlin.io
diff --git a/libraries/stdlib/jvm/src/kotlin/io/IOStreams.kt b/libraries/stdlib/jvm/src/kotlin/io/IOStreams.kt
index 74121ac26b0..d4df4255bf7 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/IOStreams.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/IOStreams.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 @file:JvmName("ByteStreamsKt")
 package kotlin.io
 
diff --git a/libraries/stdlib/jvm/src/kotlin/io/ReadWrite.kt b/libraries/stdlib/jvm/src/kotlin/io/ReadWrite.kt
index e30d0068c73..0e9e3ef2096 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/ReadWrite.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/ReadWrite.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 @file:JvmName("TextStreamsKt")
 package kotlin.io
 
diff --git a/libraries/stdlib/jvm/src/kotlin/io/Serializable.kt b/libraries/stdlib/jvm/src/kotlin/io/Serializable.kt
index 987087faf4a..7f4164c4225 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/Serializable.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/Serializable.kt
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:JvmVersion
 package kotlin.io
 
 // to use in shared code without imports
diff --git a/libraries/stdlib/jvm/src/kotlin/io/files/FilePathComponents.kt b/libraries/stdlib/jvm/src/kotlin/io/files/FilePathComponents.kt
index 57480ade5cb..c896f8a0a84 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/files/FilePathComponents.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/files/FilePathComponents.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 @file:JvmMultifileClass
 @file:JvmName("FilesKt")
 package kotlin.io
diff --git a/libraries/stdlib/jvm/src/kotlin/io/files/FileTreeWalk.kt b/libraries/stdlib/jvm/src/kotlin/io/files/FileTreeWalk.kt
index 17f54ac083f..beb1361cb79 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/files/FileTreeWalk.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/files/FileTreeWalk.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 @file:JvmMultifileClass
 @file:JvmName("FilesKt")
 package kotlin.io
diff --git a/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt b/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt
index fb608ccec6a..52eb3dc0482 100644
--- a/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt
+++ b/libraries/stdlib/jvm/src/kotlin/io/files/Utils.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 @file:JvmMultifileClass
 @file:JvmName("FilesKt")
 package kotlin.io
diff --git a/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt b/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt
index fd43a5ad161..b7728dc73da 100644
--- a/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt
+++ b/libraries/stdlib/jvm/src/kotlin/jvm/JvmDefault.kt
@@ -2,7 +2,6 @@
  * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
  * that can be found in the license/LICENSE.txt file.
  */
-@file:JvmVersion
 
 package kotlin.jvm
 
diff --git a/libraries/stdlib/jvm/src/kotlin/jvm/JvmVersion.kt b/libraries/stdlib/jvm/src/kotlin/jvm/JvmVersion.kt
deleted file mode 100644
index 25e5bc1ccb8..00000000000
--- a/libraries/stdlib/jvm/src/kotlin/jvm/JvmVersion.kt
+++ /dev/null
@@ -1,21 +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.
- */
-@file:JvmVersion
-package kotlin.jvm
-
-@Target(AnnotationTarget.FILE, AnnotationTarget.CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION)
-@Retention(AnnotationRetention.SOURCE)
-internal annotation class JvmVersion(public val minimum: Int = 6, public val maximum: Int = 100)
diff --git a/libraries/stdlib/jvm/src/kotlin/jvm/internal/unsafe/monitor.kt b/libraries/stdlib/jvm/src/kotlin/jvm/internal/unsafe/monitor.kt
index b38c698ace1..7115d254245 100644
--- a/libraries/stdlib/jvm/src/kotlin/jvm/internal/unsafe/monitor.kt
+++ b/libraries/stdlib/jvm/src/kotlin/jvm/internal/unsafe/monitor.kt
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-@file:JvmVersion
 package kotlin.jvm.internal.unsafe
 
 import kotlin.*
diff --git a/libraries/stdlib/jvm/src/kotlin/ranges/RangesJVM.kt b/libraries/stdlib/jvm/src/kotlin/ranges/RangesJVM.kt
index 5474e5012e2..881e8339a7b 100644
--- a/libraries/stdlib/jvm/src/kotlin/ranges/RangesJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/ranges/RangesJVM.kt
@@ -14,7 +14,6 @@ import kotlin.*
  *
  * Numbers are compared with the ends of this range according to IEEE-754.
  */
-@JvmVersion
 private class ClosedFloatRange (
     start: Float,
     endInclusive: Float
@@ -46,7 +45,6 @@ private class ClosedFloatRange (
  * Numbers are compared with the ends of this range according to IEEE-754.
  * @sample samples.ranges.Ranges.rangeFromFloat
  */
-@JvmVersion
 @SinceKotlin("1.1")
 public operator fun Float.rangeTo(that: Float): ClosedFloatingPointRange<Float> = ClosedFloatRange(this, that)
 
diff --git a/libraries/stdlib/jvm/src/kotlin/system/Process.kt b/libraries/stdlib/jvm/src/kotlin/system/Process.kt
index 565953e28c2..207c4a48954 100644
--- a/libraries/stdlib/jvm/src/kotlin/system/Process.kt
+++ b/libraries/stdlib/jvm/src/kotlin/system/Process.kt
@@ -1,5 +1,4 @@
 @file:kotlin.jvm.JvmName("ProcessKt")
-@file:kotlin.jvm.JvmVersion
 package kotlin.system
 
 import kotlin.*
diff --git a/libraries/stdlib/jvm/src/kotlin/system/Timing.kt b/libraries/stdlib/jvm/src/kotlin/system/Timing.kt
index 66cc26b2011..c37567bbe25 100644
--- a/libraries/stdlib/jvm/src/kotlin/system/Timing.kt
+++ b/libraries/stdlib/jvm/src/kotlin/system/Timing.kt
@@ -1,5 +1,4 @@
 @file:kotlin.jvm.JvmName("TimingKt")
-@file:kotlin.jvm.JvmVersion
 package kotlin.system
 
 /**
diff --git a/libraries/stdlib/jvm/src/kotlin/text/CharCategory.kt b/libraries/stdlib/jvm/src/kotlin/text/CharCategory.kt
index e594ce309ee..4c6460e9748 100644
--- a/libraries/stdlib/jvm/src/kotlin/text/CharCategory.kt
+++ b/libraries/stdlib/jvm/src/kotlin/text/CharCategory.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 package kotlin.text
 
 import kotlin.*
diff --git a/libraries/stdlib/jvm/src/kotlin/text/CharDirectionality.kt b/libraries/stdlib/jvm/src/kotlin/text/CharDirectionality.kt
index 73478592d7c..fffe7924f37 100644
--- a/libraries/stdlib/jvm/src/kotlin/text/CharDirectionality.kt
+++ b/libraries/stdlib/jvm/src/kotlin/text/CharDirectionality.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 package kotlin.text
 
 import kotlin.*
diff --git a/libraries/stdlib/jvm/src/kotlin/text/CharJVM.kt b/libraries/stdlib/jvm/src/kotlin/text/CharJVM.kt
index 8eae71499d9..0c26d30162d 100644
--- a/libraries/stdlib/jvm/src/kotlin/text/CharJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/text/CharJVM.kt
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:kotlin.jvm.JvmVersion
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("CharsKt")
 
diff --git a/libraries/stdlib/jvm/src/kotlin/text/Charsets.kt b/libraries/stdlib/jvm/src/kotlin/text/Charsets.kt
index 8b85adccbd0..063e97eeb7c 100644
--- a/libraries/stdlib/jvm/src/kotlin/text/Charsets.kt
+++ b/libraries/stdlib/jvm/src/kotlin/text/Charsets.kt
@@ -1,5 +1,4 @@
 @file:JvmName("CharsetsKt")
-@file:JvmVersion
 package kotlin.text
 
 import java.nio.charset.*
diff --git a/libraries/stdlib/jvm/src/kotlin/text/StringBuilderJVM.kt b/libraries/stdlib/jvm/src/kotlin/text/StringBuilderJVM.kt
index 5683022fef4..53741f01e1f 100644
--- a/libraries/stdlib/jvm/src/kotlin/text/StringBuilderJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/text/StringBuilderJVM.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("StringsKt")
 
@@ -7,7 +6,6 @@ package kotlin.text
 /**
  * Sets the character at the specified [index] to the specified [value].
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public inline operator fun StringBuilder.set(index: Int, value: Char): Unit = this.setCharAt(index, value)
 
diff --git a/libraries/stdlib/jvm/src/kotlin/text/StringNumberConversionsJVM.kt b/libraries/stdlib/jvm/src/kotlin/text/StringNumberConversionsJVM.kt
index 9268f7d505d..88b4022cbb5 100644
--- a/libraries/stdlib/jvm/src/kotlin/text/StringNumberConversionsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/text/StringNumberConversionsJVM.kt
@@ -18,7 +18,6 @@ import kotlin.*
  * @throws IllegalArgumentException when [radix] is not a valid radix for number to string conversion.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public inline fun Byte.toString(radix: Int): String = this.toInt().toString(checkRadix(radix))
 
@@ -28,7 +27,6 @@ public inline fun Byte.toString(radix: Int): String = this.toInt().toString(chec
  * @throws IllegalArgumentException when [radix] is not a valid radix for number to string conversion.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public inline fun Short.toString(radix: Int): String = this.toInt().toString(checkRadix(radix))
 
@@ -38,7 +36,6 @@ public inline fun Short.toString(radix: Int): String = this.toInt().toString(che
  * @throws IllegalArgumentException when [radix] is not a valid radix for number to string conversion.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public inline fun Int.toString(radix: Int): String = java.lang.Integer.toString(this, checkRadix(radix))
 
@@ -48,14 +45,12 @@ public inline fun Int.toString(radix: Int): String = java.lang.Integer.toString(
  * @throws IllegalArgumentException when [radix] is not a valid radix for number to string conversion.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public inline fun Long.toString(radix: Int): String = java.lang.Long.toString(this, checkRadix(radix))
 
 /**
  * Returns `true` if the contents of this string is equal to the word "true", ignoring case, and `false` otherwise.
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public actual inline fun String.toBoolean(): Boolean = java.lang.Boolean.parseBoolean(this)
 
@@ -63,7 +58,6 @@ public actual inline fun String.toBoolean(): Boolean = java.lang.Boolean.parseBo
  * Parses the string as a signed [Byte] number and returns the result.
  * @throws NumberFormatException if the string is not a valid representation of a number.
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public actual inline fun String.toByte(): Byte = java.lang.Byte.parseByte(this)
 
@@ -73,7 +67,6 @@ public actual inline fun String.toByte(): Byte = java.lang.Byte.parseByte(this)
  * @throws IllegalArgumentException when [radix] is not a valid radix for string to number conversion.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public actual inline fun String.toByte(radix: Int): Byte = java.lang.Byte.parseByte(this, checkRadix(radix))
 
@@ -82,7 +75,6 @@ public actual inline fun String.toByte(radix: Int): Byte = java.lang.Byte.parseB
  * Parses the string as a [Short] number and returns the result.
  * @throws NumberFormatException if the string is not a valid representation of a number.
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public actual inline fun String.toShort(): Short = java.lang.Short.parseShort(this)
 
@@ -92,7 +84,6 @@ public actual inline fun String.toShort(): Short = java.lang.Short.parseShort(th
  * @throws IllegalArgumentException when [radix] is not a valid radix for string to number conversion.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public actual inline fun String.toShort(radix: Int): Short = java.lang.Short.parseShort(this, checkRadix(radix))
 
@@ -100,7 +91,6 @@ public actual inline fun String.toShort(radix: Int): Short = java.lang.Short.par
  * Parses the string as an [Int] number and returns the result.
  * @throws NumberFormatException if the string is not a valid representation of a number.
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public actual inline fun String.toInt(): Int = java.lang.Integer.parseInt(this)
 
@@ -110,7 +100,6 @@ public actual inline fun String.toInt(): Int = java.lang.Integer.parseInt(this)
  * @throws IllegalArgumentException when [radix] is not a valid radix for string to number conversion.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public actual inline fun String.toInt(radix: Int): Int = java.lang.Integer.parseInt(this, checkRadix(radix))
 
@@ -118,7 +107,6 @@ public actual inline fun String.toInt(radix: Int): Int = java.lang.Integer.parse
  * Parses the string as a [Long] number and returns the result.
  * @throws NumberFormatException if the string is not a valid representation of a number.
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public actual inline fun String.toLong(): Long = java.lang.Long.parseLong(this)
 
@@ -128,7 +116,6 @@ public actual inline fun String.toLong(): Long = java.lang.Long.parseLong(this)
  * @throws IllegalArgumentException when [radix] is not a valid radix for string to number conversion.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public actual inline fun String.toLong(radix: Int): Long = java.lang.Long.parseLong(this, checkRadix(radix))
 
@@ -136,7 +123,6 @@ public actual inline fun String.toLong(radix: Int): Long = java.lang.Long.parseL
  * Parses the string as a [Float] number and returns the result.
  * @throws NumberFormatException if the string is not a valid representation of a number.
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public actual inline fun String.toFloat(): Float = java.lang.Float.parseFloat(this)
 
@@ -144,7 +130,6 @@ public actual inline fun String.toFloat(): Float = java.lang.Float.parseFloat(th
  * Parses the string as a [Double] number and returns the result.
  * @throws NumberFormatException if the string is not a valid representation of a number.
  */
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public actual inline fun String.toDouble(): Double = java.lang.Double.parseDouble(this)
 
@@ -154,7 +139,6 @@ public actual inline fun String.toDouble(): Double = java.lang.Double.parseDoubl
  * or `null` if the string is not a valid representation of a number.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 public actual fun String.toFloatOrNull(): Float? = screenFloatValue(this, java.lang.Float::parseFloat)
 
 /**
@@ -162,7 +146,6 @@ public actual fun String.toFloatOrNull(): Float? = screenFloatValue(this, java.l
  * or `null` if the string is not a valid representation of a number.
  */
 @SinceKotlin("1.1")
-@kotlin.jvm.JvmVersion
 public actual fun String.toDoubleOrNull(): Double? = screenFloatValue(this, java.lang.Double::parseDouble)
 
 /**
@@ -170,7 +153,6 @@ public actual fun String.toDoubleOrNull(): Double? = screenFloatValue(this, java
  * @throws NumberFormatException if the string is not a valid representation of a number.
  */
 @SinceKotlin("1.2")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public inline fun String.toBigInteger(): java.math.BigInteger =
     java.math.BigInteger(this)
@@ -181,7 +163,6 @@ public inline fun String.toBigInteger(): java.math.BigInteger =
  * @throws IllegalArgumentException when [radix] is not a valid radix for string to number conversion.
  */
 @SinceKotlin("1.2")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public inline fun String.toBigInteger(radix: Int): java.math.BigInteger =
     java.math.BigInteger(this, checkRadix(radix))
@@ -191,7 +172,6 @@ public inline fun String.toBigInteger(radix: Int): java.math.BigInteger =
  * or `null` if the string is not a valid representation of a number.
  */
 @SinceKotlin("1.2")
-@kotlin.jvm.JvmVersion
 public fun String.toBigIntegerOrNull(): java.math.BigInteger? = toBigIntegerOrNull(10)
 
 /**
@@ -201,7 +181,6 @@ public fun String.toBigIntegerOrNull(): java.math.BigInteger? = toBigIntegerOrNu
  * @throws IllegalArgumentException when [radix] is not a valid radix for string to number conversion.
  */
 @SinceKotlin("1.2")
-@kotlin.jvm.JvmVersion
 public fun String.toBigIntegerOrNull(radix: Int): java.math.BigInteger? {
     checkRadix(radix)
     val length = this.length
@@ -225,7 +204,6 @@ public fun String.toBigIntegerOrNull(radix: Int): java.math.BigInteger? {
  * @throws NumberFormatException if the string is not a valid representation of a number.
  */
 @SinceKotlin("1.2")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public inline fun String.toBigDecimal(): java.math.BigDecimal =
     java.math.BigDecimal(this)
@@ -238,7 +216,6 @@ public inline fun String.toBigDecimal(): java.math.BigDecimal =
  * @throws ArithmeticException if the rounding is needed, but the rounding mode is [java.math.RoundingMode.UNNECESSARY].
  */
 @SinceKotlin("1.2")
-@kotlin.jvm.JvmVersion
 @kotlin.internal.InlineOnly
 public inline fun String.toBigDecimal(mathContext: java.math.MathContext): java.math.BigDecimal =
     java.math.BigDecimal(this, mathContext)
@@ -248,7 +225,6 @@ public inline fun String.toBigDecimal(mathContext: java.math.MathContext): java.
  * or `null` if the string is not a valid representation of a number.
  */
 @SinceKotlin("1.2")
-@kotlin.jvm.JvmVersion
 public fun String.toBigDecimalOrNull(): java.math.BigDecimal? =
     screenFloatValue(this) { it.toBigDecimal() }
 
@@ -260,14 +236,12 @@ public fun String.toBigDecimalOrNull(): java.math.BigDecimal? =
  * @throws ArithmeticException if the rounding is needed, but the rounding mode is [java.math.RoundingMode.UNNECESSARY].
  */
 @SinceKotlin("1.2")
-@kotlin.jvm.JvmVersion
 public fun String.toBigDecimalOrNull(mathContext: java.math.MathContext): java.math.BigDecimal? =
     screenFloatValue(this) { it.toBigDecimal(mathContext) }
 
 /**
  * Recommended floating point number validation RegEx from the javadoc of `java.lang.Double.valueOf(String)`
  */
-@kotlin.jvm.JvmVersion
 private object ScreenFloatValueRegEx {
     @JvmField val value = run {
         val Digits = "(\\p{Digit}+)"
@@ -287,7 +261,6 @@ private object ScreenFloatValueRegEx {
     }
 }
 
-@kotlin.jvm.JvmVersion
 private inline fun <T> screenFloatValue(str: String, parse: (String) -> T): T? {
     return try {
         if (ScreenFloatValueRegEx.value.matches(str))
diff --git a/libraries/stdlib/jvm/src/kotlin/text/StringsJVM.kt b/libraries/stdlib/jvm/src/kotlin/text/StringsJVM.kt
index e1ab705af8d..f26ef1b39a9 100644
--- a/libraries/stdlib/jvm/src/kotlin/text/StringsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/text/StringsJVM.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("StringsKt")
 @file:Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
diff --git a/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt b/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt
index cc472bd1440..f23850b147c 100644
--- a/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt
+++ b/libraries/stdlib/jvm/src/kotlin/text/regex/Regex.kt
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@file:JvmVersion
 package kotlin.text
 
 import java.util.Collections
diff --git a/libraries/stdlib/jvm/src/kotlin/text/regex/RegexExtensionsJVM.kt b/libraries/stdlib/jvm/src/kotlin/text/regex/RegexExtensionsJVM.kt
index 970026d1a29..23d3b6a94e1 100644
--- a/libraries/stdlib/jvm/src/kotlin/text/regex/RegexExtensionsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/text/regex/RegexExtensionsJVM.kt
@@ -14,6 +14,5 @@ package kotlin.text
  *
  * Provides the way to use Regex API on the instances of [java.util.regex.Pattern].
  */
-@JvmVersion
 @kotlin.internal.InlineOnly
 public inline fun java.util.regex.Pattern.toRegex(): Regex = Regex(this)
\ No newline at end of file
diff --git a/libraries/stdlib/jvm/src/kotlin/util/AssertionsJVM.kt b/libraries/stdlib/jvm/src/kotlin/util/AssertionsJVM.kt
index 44a7be5e38d..473e6c48043 100644
--- a/libraries/stdlib/jvm/src/kotlin/util/AssertionsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/util/AssertionsJVM.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("PreconditionsKt")
 package kotlin
diff --git a/libraries/stdlib/jvm/src/kotlin/util/BigDecimals.kt b/libraries/stdlib/jvm/src/kotlin/util/BigDecimals.kt
index e2c0185fca6..060741d752e 100644
--- a/libraries/stdlib/jvm/src/kotlin/util/BigDecimals.kt
+++ b/libraries/stdlib/jvm/src/kotlin/util/BigDecimals.kt
@@ -16,7 +16,6 @@
 
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("MathKt")
-@file:kotlin.jvm.JvmVersion
 
 package kotlin
 
diff --git a/libraries/stdlib/jvm/src/kotlin/util/BigIntegers.kt b/libraries/stdlib/jvm/src/kotlin/util/BigIntegers.kt
index 4216d2fed48..668a9648d14 100644
--- a/libraries/stdlib/jvm/src/kotlin/util/BigIntegers.kt
+++ b/libraries/stdlib/jvm/src/kotlin/util/BigIntegers.kt
@@ -16,7 +16,6 @@
 
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("MathKt")
-@file:kotlin.jvm.JvmVersion
 
 package kotlin
 
diff --git a/libraries/stdlib/jvm/src/kotlin/util/Exceptions.kt b/libraries/stdlib/jvm/src/kotlin/util/Exceptions.kt
index f594600a432..481b3f0d42c 100644
--- a/libraries/stdlib/jvm/src/kotlin/util/Exceptions.kt
+++ b/libraries/stdlib/jvm/src/kotlin/util/Exceptions.kt
@@ -1,6 +1,5 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("ExceptionsKt")
-@file:kotlin.jvm.JvmVersion
 @file:Suppress("PLATFORM_CLASS_MAPPED_TO_KOTLIN")
 package kotlin
 
diff --git a/libraries/stdlib/jvm/src/kotlin/util/LazyJVM.kt b/libraries/stdlib/jvm/src/kotlin/util/LazyJVM.kt
index 63f662a0d7f..b082cb42c89 100644
--- a/libraries/stdlib/jvm/src/kotlin/util/LazyJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/util/LazyJVM.kt
@@ -18,7 +18,6 @@ package kotlin
  * Note that the returned instance uses itself to synchronize on. Do not synchronize from external code on
  * the returned instance as it may cause accidental deadlock. Also this behavior can be changed in the future.
  */
-@kotlin.jvm.JvmVersion
 public actual fun <T> lazy(initializer: () -> T): Lazy<T> = SynchronizedLazyImpl(initializer)
 
 /**
@@ -31,7 +30,6 @@ public actual fun <T> lazy(initializer: () -> T): Lazy<T> = SynchronizedLazyImpl
  * to synchronize on. Do not synchronize from external code on the returned instance as it may cause accidental deadlock.
  * Also this behavior can be changed in the future.
  */
-@kotlin.jvm.JvmVersion
 public actual fun <T> lazy(mode: LazyThreadSafetyMode, initializer: () -> T): Lazy<T> =
     when (mode) {
         LazyThreadSafetyMode.SYNCHRONIZED -> SynchronizedLazyImpl(initializer)
@@ -50,12 +48,10 @@ public actual fun <T> lazy(mode: LazyThreadSafetyMode, initializer: () -> T): La
  * in this case do not synchronize from external code on the returned instance as it may cause accidental deadlock.
  * Also this behavior can be changed in the future.
  */
-@kotlin.jvm.JvmVersion
 public actual fun <T> lazy(lock: Any?, initializer: () -> T): Lazy<T> = SynchronizedLazyImpl(initializer, lock)
 
 
 
-@JvmVersion
 private class SynchronizedLazyImpl<out T>(initializer: () -> T, lock: Any? = null) : Lazy<T>, Serializable {
     private var initializer: (() -> T)? = initializer
     @Volatile private var _value: Any? = UNINITIALIZED_VALUE
@@ -92,7 +88,6 @@ private class SynchronizedLazyImpl<out T>(initializer: () -> T, lock: Any? = nul
 }
 
 
-@kotlin.jvm.JvmVersion
 private class SafePublicationLazyImpl<out T>(initializer: () -> T) : Lazy<T>, Serializable {
     @Volatile private var initializer: (() -> T)? = initializer
     @Volatile private var _value: Any? = UNINITIALIZED_VALUE
diff --git a/libraries/stdlib/jvm/src/kotlin/util/MathJVM.kt b/libraries/stdlib/jvm/src/kotlin/util/MathJVM.kt
index 04a6bbed4d6..e7681c1aeff 100644
--- a/libraries/stdlib/jvm/src/kotlin/util/MathJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/util/MathJVM.kt
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-@file:JvmVersion
 @file:JvmMultifileClass
 @file:JvmName("MathKt")
 
diff --git a/libraries/stdlib/jvm/src/kotlin/util/Numbers.kt b/libraries/stdlib/jvm/src/kotlin/util/Numbers.kt
index 9a27c8ab3d9..36cb0e90b7a 100644
--- a/libraries/stdlib/jvm/src/kotlin/util/Numbers.kt
+++ b/libraries/stdlib/jvm/src/kotlin/util/Numbers.kt
@@ -1,6 +1,5 @@
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("MathKt")
-@file:kotlin.jvm.JvmVersion
 package kotlin
 
 /**
diff --git a/libraries/stdlib/jvm/src/kotlin/util/Synchronized.kt b/libraries/stdlib/jvm/src/kotlin/util/Synchronized.kt
index 6491271031d..85ca023980f 100644
--- a/libraries/stdlib/jvm/src/kotlin/util/Synchronized.kt
+++ b/libraries/stdlib/jvm/src/kotlin/util/Synchronized.kt
@@ -1,4 +1,3 @@
-@file:JvmVersion
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("StandardKt")
 package kotlin
diff --git a/libraries/stdlib/jvm/test/ExceptionJVMTest.kt b/libraries/stdlib/jvm/test/ExceptionJVMTest.kt
index dedfcfc9fbb..d53a6db7b5d 100644
--- a/libraries/stdlib/jvm/test/ExceptionJVMTest.kt
+++ b/libraries/stdlib/jvm/test/ExceptionJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.exceptions
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt b/libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt
index b95c16563fa..26949c3d2fa 100644
--- a/libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt
+++ b/libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.collections
 
 import test.assertStaticAndRuntimeTypeIs
diff --git a/libraries/stdlib/jvm/test/collections/IterableJVMTests.kt b/libraries/stdlib/jvm/test/collections/IterableJVMTests.kt
index 089f974d9c2..83b4a7d2bd9 100644
--- a/libraries/stdlib/jvm/test/collections/IterableJVMTests.kt
+++ b/libraries/stdlib/jvm/test/collections/IterableJVMTests.kt
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-@file:kotlin.jvm.JvmVersion
 package test.collections
 
 import java.util.*
diff --git a/libraries/stdlib/jvm/test/collections/IteratorsJVMTest.kt b/libraries/stdlib/jvm/test/collections/IteratorsJVMTest.kt
index 0a91b93222c..eec3f19c44e 100644
--- a/libraries/stdlib/jvm/test/collections/IteratorsJVMTest.kt
+++ b/libraries/stdlib/jvm/test/collections/IteratorsJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.collections
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/collections/MapJVMTest.kt b/libraries/stdlib/jvm/test/collections/MapJVMTest.kt
index 5ef1b2c4a4d..9b61b6f6585 100644
--- a/libraries/stdlib/jvm/test/collections/MapJVMTest.kt
+++ b/libraries/stdlib/jvm/test/collections/MapJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.collections
 
 import java.util.concurrent.ConcurrentHashMap
diff --git a/libraries/stdlib/jvm/test/collections/MutableCollectionsJVMTest.kt b/libraries/stdlib/jvm/test/collections/MutableCollectionsJVMTest.kt
index 43d70b0f2f9..37b1828b6c3 100644
--- a/libraries/stdlib/jvm/test/collections/MutableCollectionsJVMTest.kt
+++ b/libraries/stdlib/jvm/test/collections/MutableCollectionsJVMTest.kt
@@ -3,7 +3,6 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-@file:JvmVersion
 package test.collections
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/collections/SequenceJVMTest.kt b/libraries/stdlib/jvm/test/collections/SequenceJVMTest.kt
index 786dea59fe3..cb86dde8e61 100644
--- a/libraries/stdlib/jvm/test/collections/SequenceJVMTest.kt
+++ b/libraries/stdlib/jvm/test/collections/SequenceJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.collections
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/concurrent/ThreadTest.kt b/libraries/stdlib/jvm/test/concurrent/ThreadTest.kt
index 93ef2566535..d4feec98426 100644
--- a/libraries/stdlib/jvm/test/concurrent/ThreadTest.kt
+++ b/libraries/stdlib/jvm/test/concurrent/ThreadTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.concurrent
 
 import kotlin.concurrent.*
diff --git a/libraries/stdlib/jvm/test/concurrent/TimerTest.kt b/libraries/stdlib/jvm/test/concurrent/TimerTest.kt
index 1c79b7d43dc..550fd133ed3 100644
--- a/libraries/stdlib/jvm/test/concurrent/TimerTest.kt
+++ b/libraries/stdlib/jvm/test/concurrent/TimerTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.concurrent
 
 import java.util.*
diff --git a/libraries/stdlib/jvm/test/io/Console.kt b/libraries/stdlib/jvm/test/io/Console.kt
index 05df08156db..d27f1f7c410 100644
--- a/libraries/stdlib/jvm/test/io/Console.kt
+++ b/libraries/stdlib/jvm/test/io/Console.kt
@@ -4,7 +4,6 @@
  */
 
 @file:Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
-@file:kotlin.jvm.JvmVersion
 package test.io
 
 import org.junit.Test
diff --git a/libraries/stdlib/jvm/test/io/FileTreeWalks.kt b/libraries/stdlib/jvm/test/io/FileTreeWalks.kt
index 377b2f6ae61..05e73c70f95 100644
--- a/libraries/stdlib/jvm/test/io/FileTreeWalks.kt
+++ b/libraries/stdlib/jvm/test/io/FileTreeWalks.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.io
 
 import java.io.File
diff --git a/libraries/stdlib/jvm/test/io/Files.kt b/libraries/stdlib/jvm/test/io/Files.kt
index 471ca5f90df..dafd94f6211 100644
--- a/libraries/stdlib/jvm/test/io/Files.kt
+++ b/libraries/stdlib/jvm/test/io/Files.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.io
 
 import java.io.*
diff --git a/libraries/stdlib/jvm/test/io/IOStreams.kt b/libraries/stdlib/jvm/test/io/IOStreams.kt
index 4bf9d25c217..4d2e1c2f9db 100644
--- a/libraries/stdlib/jvm/test/io/IOStreams.kt
+++ b/libraries/stdlib/jvm/test/io/IOStreams.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.io
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/io/ReadWrite.kt b/libraries/stdlib/jvm/test/io/ReadWrite.kt
index fafac936479..c34d3ed92ef 100644
--- a/libraries/stdlib/jvm/test/io/ReadWrite.kt
+++ b/libraries/stdlib/jvm/test/io/ReadWrite.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.io
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/io/SerializableTest.kt b/libraries/stdlib/jvm/test/io/SerializableTest.kt
index 9aac9979b73..399a9790034 100644
--- a/libraries/stdlib/jvm/test/io/SerializableTest.kt
+++ b/libraries/stdlib/jvm/test/io/SerializableTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.io
 
 import java.io.*
diff --git a/libraries/stdlib/jvm/test/js/StubsJVM.kt b/libraries/stdlib/jvm/test/js/StubsJVM.kt
index 2d8f6d0ae2c..fa340292c0f 100644
--- a/libraries/stdlib/jvm/test/js/StubsJVM.kt
+++ b/libraries/stdlib/jvm/test/js/StubsJVM.kt
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-@file:JvmVersion
 package test.collections.js
 
 public actual fun <V> stringMapOf(vararg pairs: Pair<String, V>): HashMap<String, V> = hashMapOf<String, V>(*pairs)
diff --git a/libraries/stdlib/jvm/test/numbers/BigNumbersTest.kt b/libraries/stdlib/jvm/test/numbers/BigNumbersTest.kt
index beca7e7d542..27690581cf2 100644
--- a/libraries/stdlib/jvm/test/numbers/BigNumbersTest.kt
+++ b/libraries/stdlib/jvm/test/numbers/BigNumbersTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.numbers
 
 import java.math.BigInteger
diff --git a/libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt b/libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt
index 69e50702343..ed46f68c468 100644
--- a/libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt
+++ b/libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-@file:kotlin.jvm.JvmVersion
 package test.numbers
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/numbers/MathJVMTest.kt b/libraries/stdlib/jvm/test/numbers/MathJVMTest.kt
index 4095bb9777c..34af1390e82 100644
--- a/libraries/stdlib/jvm/test/numbers/MathJVMTest.kt
+++ b/libraries/stdlib/jvm/test/numbers/MathJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.numbers
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt b/libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt
index 050a68b5738..f995994fcdf 100644
--- a/libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt
+++ b/libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.numbers
 
 import java.math.BigDecimal
diff --git a/libraries/stdlib/jvm/test/properties/delegation/lazy/LazyValuesJVMTest.kt b/libraries/stdlib/jvm/test/properties/delegation/lazy/LazyValuesJVMTest.kt
index 548d0950779..a5dbf4157e1 100644
--- a/libraries/stdlib/jvm/test/properties/delegation/lazy/LazyValuesJVMTest.kt
+++ b/libraries/stdlib/jvm/test/properties/delegation/lazy/LazyValuesJVMTest.kt
@@ -3,7 +3,6 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-@file:JvmVersion
 package test.properties.delegation.lazy
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/ranges/RangeIterationJVMTest.kt b/libraries/stdlib/jvm/test/ranges/RangeIterationJVMTest.kt
index cf22ee604da..4f11cf9a783 100644
--- a/libraries/stdlib/jvm/test/ranges/RangeIterationJVMTest.kt
+++ b/libraries/stdlib/jvm/test/ranges/RangeIterationJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.ranges
 
 import java.lang.Integer.MAX_VALUE as MaxI
diff --git a/libraries/stdlib/jvm/test/reflection/AnnotationsTest.kt b/libraries/stdlib/jvm/test/reflection/AnnotationsTest.kt
index 095cc8b4b5f..4fdef772d50 100644
--- a/libraries/stdlib/jvm/test/reflection/AnnotationsTest.kt
+++ b/libraries/stdlib/jvm/test/reflection/AnnotationsTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 @file:Suppress("DEPRECATION", "DEPRECATED_JAVA_ANNOTATION")
 package test.reflection
 
diff --git a/libraries/stdlib/jvm/test/testUtilsJVM.kt b/libraries/stdlib/jvm/test/testUtilsJVM.kt
index 4c0fc56467a..ca990195c34 100644
--- a/libraries/stdlib/jvm/test/testUtilsJVM.kt
+++ b/libraries/stdlib/jvm/test/testUtilsJVM.kt
@@ -18,18 +18,14 @@ package test
 
 import kotlin.test.assertEquals
 
-@JvmVersion
 public actual fun assertTypeEquals(expected: Any?, actual: Any?) {
     assertEquals(expected?.javaClass, actual?.javaClass)
 }
 
-@JvmVersion
 public actual fun randomInt(limit: Int): Int = (Math.random() * limit).toInt()
 
-@kotlin.jvm.JvmVersion
 private val isJava6 = System.getProperty("java.version").startsWith("1.6.")
 
-@kotlin.jvm.JvmVersion
 internal actual fun String.removeLeadingPlusOnJava6(): String =
     if (isJava6) removePrefix("+") else this
 
diff --git a/libraries/stdlib/jvm/test/text/CharJVMTest.kt b/libraries/stdlib/jvm/test/text/CharJVMTest.kt
index 0fb05b23cd6..edc7d1fc3a8 100644
--- a/libraries/stdlib/jvm/test/text/CharJVMTest.kt
+++ b/libraries/stdlib/jvm/test/text/CharJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.text
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/text/RegexJVMTest.kt b/libraries/stdlib/jvm/test/text/RegexJVMTest.kt
index 3f5abb34d60..f23404a8792 100644
--- a/libraries/stdlib/jvm/test/text/RegexJVMTest.kt
+++ b/libraries/stdlib/jvm/test/text/RegexJVMTest.kt
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-@file:kotlin.jvm.JvmVersion
 package test.text
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/text/StringBuilderJVMTest.kt b/libraries/stdlib/jvm/test/text/StringBuilderJVMTest.kt
index 74d348f5847..b04b87fb322 100644
--- a/libraries/stdlib/jvm/test/text/StringBuilderJVMTest.kt
+++ b/libraries/stdlib/jvm/test/text/StringBuilderJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.text
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/text/StringJVMTest.kt b/libraries/stdlib/jvm/test/text/StringJVMTest.kt
index 74fbb0ac0d4..b1dfc9f64a7 100644
--- a/libraries/stdlib/jvm/test/text/StringJVMTest.kt
+++ b/libraries/stdlib/jvm/test/text/StringJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.text
 
 import test.collections.assertArrayNotSameButEquals
diff --git a/libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt b/libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt
index ac72e991e21..a89ae9efbbf 100644
--- a/libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt
+++ b/libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt
@@ -3,7 +3,6 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-@file:JvmVersion
 package test.text
 
 import test.*
@@ -11,21 +10,18 @@ import kotlin.test.*
 
 class StringNumberConversionJVMTest {
 
-    @JvmVersion
     @Test fun toIntArabicDigits() {
         compareConversion({ it.toInt() }, { it.toIntOrNull() }) {
             assertProduces("٢٣١٩٦٠", 231960)
         }
     }
 
-    @JvmVersion
     @Test fun toLongArabicDigits() {
         compareConversion({ it.toLong() }, { it.toLongOrNull() }) {
             assertProduces("٢٣١٩٦٠٧٧٨٤٥٩", 231960778459)
         }
     }
 
-    @kotlin.jvm.JvmVersion
     @Test fun toFloat() {
         compareConversion(String::toFloat, String::toFloatOrNull) {
             assertProduces("77.0", 77.0f)
@@ -38,7 +34,6 @@ class StringNumberConversionJVMTest {
     }
 
 
-    @kotlin.jvm.JvmVersion
     @Test fun toHexDouble() {
         compareConversion(String::toDouble, String::toDoubleOrNull, ::doubleTotalOrderEquals) {
             assertProduces("0x77p1", (0x77 shl 1).toDouble())
@@ -49,7 +44,6 @@ class StringNumberConversionJVMTest {
     }
 
 
-    @kotlin.jvm.JvmVersion
     @Test fun byteToStringWithRadix() {
         assertEquals("7a", 0x7a.toByte().toString(16))
         assertEquals("-80", Byte.MIN_VALUE.toString(radix = 16))
@@ -60,7 +54,6 @@ class StringNumberConversionJVMTest {
         assertFailsWith<IllegalArgumentException>("Expected to fail with radix 1") { 1.toByte().toString(radix = 1) }
     }
 
-    @kotlin.jvm.JvmVersion
     @Test fun shortToStringWithRadix() {
         assertEquals("7FFF", 0x7FFF.toShort().toString(radix = 16).toUpperCase())
         assertEquals("-8000", (-0x8000).toShort().toString(radix = 16))
@@ -70,7 +63,6 @@ class StringNumberConversionJVMTest {
         assertFailsWith<IllegalArgumentException>("Expected to fail with radix 1") { 1.toShort().toString(radix = 1) }
     }
 
-    @kotlin.jvm.JvmVersion
     @Test fun intToStringWithRadix() {
         assertEquals("-ff", (-255).toString(radix = 16))
         assertEquals("1100110", 102.toString(radix = 2))
@@ -80,7 +72,6 @@ class StringNumberConversionJVMTest {
 
     }
 
-    @kotlin.jvm.JvmVersion
     @Test fun longToStringWithRadix() {
         assertEquals("7f11223344556677", 0x7F11223344556677.toString(radix = 16))
         assertEquals("hazelnut", 1356099454469L.toString(radix = 36))
@@ -90,7 +81,6 @@ class StringNumberConversionJVMTest {
         assertFailsWith<IllegalArgumentException>("Expected to fail with radix 1") { 1L.toString(radix = 1) }
     }
 
-    @kotlin.jvm.JvmVersion
     @Test fun toBigInteger() {
         compareConversion(String::toBigInteger, String::toBigIntegerOrNull) {
             assertProduces("0", java.math.BigInteger.ZERO)
@@ -118,7 +108,6 @@ class StringNumberConversionJVMTest {
         }
     }
 
-    @kotlin.jvm.JvmVersion
     @Test fun toBigDecimal() {
         fun bd(value: String) = java.math.BigDecimal(value)
         compareConversion(String::toBigDecimal, String::toBigDecimalOrNull) {
diff --git a/libraries/stdlib/jvm/test/utils/AssertionsJVMTest.kt b/libraries/stdlib/jvm/test/utils/AssertionsJVMTest.kt
index 22f2eea54fe..ec053705f26 100644
--- a/libraries/stdlib/jvm/test/utils/AssertionsJVMTest.kt
+++ b/libraries/stdlib/jvm/test/utils/AssertionsJVMTest.kt
@@ -3,7 +3,6 @@
  * that can be found in the license/LICENSE.txt file.
  */
 
-@file:JvmVersion
 package test.utils
 
 import kotlin.test.*
diff --git a/libraries/stdlib/jvm/test/utils/LazyJVMTest.kt b/libraries/stdlib/jvm/test/utils/LazyJVMTest.kt
index 899140d2cf0..5faf565df28 100644
--- a/libraries/stdlib/jvm/test/utils/LazyJVMTest.kt
+++ b/libraries/stdlib/jvm/test/utils/LazyJVMTest.kt
@@ -1,4 +1,3 @@
-@file:kotlin.jvm.JvmVersion
 package test.utils
 
 
diff --git a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt
index 23c2515fd41..14769ad2883 100644
--- a/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt
+++ b/libraries/tools/kotlin-stdlib-gen/src/templates/dsl/Writers.kt
@@ -72,8 +72,6 @@ fun List<MemberBuilder>.writeTo(file: File, platformSource: PlatformSourceFile)
         }
 
         writer.appendln("@file:kotlin.jvm.JvmName(\"${sourceFile.jvmClassName}\")")
-        if (platform == Platform.JVM)
-            writer.appendln("@file:kotlin.jvm.JvmVersion")
         writer.appendln()
 
         writer.append("package ${sourceFile.packageName ?: "kotlin"}\n\n")