diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index e3a59d2243d..8c824d49445 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -408,7 +408,6 @@
     <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
new file mode 100644
index 00000000000..50cd6a8310b
--- /dev/null
+++ b/core/runtime.jvm/src/kotlin/jvm/internal/NonVolatileRef.java
@@ -0,0 +1,102 @@
+/*
+ * 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/core/runtime.jvm/src/kotlin/jvm/internal/Ref.java b/core/runtime.jvm/src/kotlin/jvm/internal/Ref.java
index caa6ea1cd80..dcbcf83770b 100644
--- a/core/runtime.jvm/src/kotlin/jvm/internal/Ref.java
+++ b/core/runtime.jvm/src/kotlin/jvm/internal/Ref.java
@@ -16,8 +16,6 @@
 
 package kotlin.jvm.internal;
 
-import java.lang.Override;
-
 public class Ref {
     private Ref() {}