diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index fe55a91a572..51bb92ef580 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -416,6 +416,7 @@
     <inspection_tool class="UnnecessaryUnboxing" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="UseOfPropertiesAsHashtable" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="UtilityClassWithPublicConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="VolatileLongOrDoubleField" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="WaitNotInLoop" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="WaitNotInSynchronizedContext" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="WaitWhileHoldingTwoLocks" enabled="true" level="WARNING" enabled_by_default="true" />
diff --git a/core/runtime.jvm/src/kotlin/jvm/internal/NonVolatileRef.java b/core/runtime.jvm/src/kotlin/jvm/internal/NonVolatileRef.java
deleted file mode 100644
index 50cd6a8310b..00000000000
--- a/core/runtime.jvm/src/kotlin/jvm/internal/NonVolatileRef.java
+++ /dev/null
@@ -1,102 +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.jvm.internal;
-
-public class NonVolatileRef {
-    private NonVolatileRef() {}
-
-    public static final class ObjectRef<T> {
-        public T element;
-
-        @Override
-        public String toString() {
-            return String.valueOf(element);
-        }
-    }
-
-    public static final class ByteRef {
-        public byte element;
-
-        @Override
-        public String toString() {
-            return String.valueOf(element);
-        }
-    }
-
-    public static final class ShortRef {
-        public short element;
-
-        @Override
-        public String toString() {
-            return String.valueOf(element);
-        }
-    }
-
-    public static final class IntRef {
-        public int element;
-
-        @Override
-        public String toString() {
-            return String.valueOf(element);
-        }
-    }
-
-    public static final class LongRef {
-        public long element;
-
-        @Override
-        public String toString() {
-            return String.valueOf(element);
-        }
-    }
-
-    public static final class FloatRef {
-        public float element;
-
-        @Override
-        public String toString() {
-            return String.valueOf(element);
-        }
-    }
-
-    public static final class DoubleRef {
-        public double element;
-
-        @Override
-        public String toString() {
-            return String.valueOf(element);
-        }
-    }
-
-    public static final class CharRef {
-        public char element;
-
-        @Override
-        public String toString() {
-            return String.valueOf(element);
-        }
-    }
-
-    public static final class BooleanRef {
-        public boolean element;
-
-        @Override
-        public String toString() {
-            return String.valueOf(element);
-        }
-    }
-}
diff --git a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt
index f44ba2a2fc6..c1441472a76 100644
--- a/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt
+++ b/libraries/tools/binary-compatibility-validator/reference-public-api/kotlin-runtime.txt
@@ -682,63 +682,6 @@ public class kotlin/jvm/internal/MutablePropertyReference2Impl : kotlin/jvm/inte
 	public fun set (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
 }
 
-public class kotlin/jvm/internal/NonVolatileRef {
-}
-
-public final class kotlin/jvm/internal/NonVolatileRef$BooleanRef {
-	public field element Z
-	public fun <init> ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class kotlin/jvm/internal/NonVolatileRef$ByteRef {
-	public field element B
-	public fun <init> ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class kotlin/jvm/internal/NonVolatileRef$CharRef {
-	public field element C
-	public fun <init> ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class kotlin/jvm/internal/NonVolatileRef$DoubleRef {
-	public field element D
-	public fun <init> ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class kotlin/jvm/internal/NonVolatileRef$FloatRef {
-	public field element F
-	public fun <init> ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class kotlin/jvm/internal/NonVolatileRef$IntRef {
-	public field element I
-	public fun <init> ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class kotlin/jvm/internal/NonVolatileRef$LongRef {
-	public field element J
-	public fun <init> ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class kotlin/jvm/internal/NonVolatileRef$ObjectRef {
-	public field element Ljava/lang/Object;
-	public fun <init> ()V
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class kotlin/jvm/internal/NonVolatileRef$ShortRef {
-	public field element S
-	public fun <init> ()V
-	public fun toString ()Ljava/lang/String;
-}
-
 public abstract class kotlin/jvm/internal/PrimitiveSpreadBuilder {
 	public fun <init> (I)V
 	public final fun addSpread (Ljava/lang/Object;)V