diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
index 59609ba6f977..28ad7eb2401c 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
@@ -645,7 +645,6 @@ final.private.method.display.name='private' method declared 'final'
 enum.switch.statement.which.misses.cases.display.name=Enum 'switch' statement that misses case
 enum.switch.statement.which.misses.cases.option=Ignore switch statements with a default branch
 unconstructable.test.case.display.name=Unconstructable JUnit TestCase
-volatile.long.or.double.field.display.name=Volatile long or double field
 string.buffer.must.have.initial.capacity.display.name=StringBuilder without initial capacity
 method.may.be.static.display.name=Method may be 'static'
 class.initializer.may.be.static.display.name=Class initializer may be 'static'
diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/VolatileLongOrDoubleFieldInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/VolatileLongOrDoubleFieldInspection.java
deleted file mode 100644
index 266086306b99..000000000000
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/VolatileLongOrDoubleFieldInspection.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2003-2007 Dave Griffith, Bas Leijdekkers
- *
- * 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 com.siyeh.ig.threading;
-
-import com.intellij.psi.PsiField;
-import com.intellij.psi.PsiModifier;
-import com.intellij.psi.PsiType;
-import com.siyeh.InspectionGadgetsBundle;
-import com.siyeh.ig.BaseInspection;
-import com.siyeh.ig.BaseInspectionVisitor;
-import org.jetbrains.annotations.NotNull;
-
-public class VolatileLongOrDoubleFieldInspection extends BaseInspection {
-
-  @Override
-  @NotNull
-  public String getDisplayName() {
-    return InspectionGadgetsBundle.message(
-      "volatile.long.or.double.field.display.name");
-  }
-
-  @Override
-  @NotNull
-  public String buildErrorString(Object... infos) {
-    final PsiType type = (PsiType)infos[0];
-    final String typeString = type.getPresentableText();
-    return InspectionGadgetsBundle.message(
-      "volatile.field.problem.descriptor", typeString);
-  }
-
-  @Override
-  public BaseInspectionVisitor buildVisitor() {
-    return new VolatileLongOrDoubleFieldVisitor();
-  }
-
-  private static class VolatileLongOrDoubleFieldVisitor
-    extends BaseInspectionVisitor {
-
-    @Override
-    public void visitField(@NotNull PsiField field) {
-      super.visitField(field);
-      if (!field.hasModifierProperty(PsiModifier.VOLATILE)) {
-        return;
-      }
-      final PsiType type = field.getType();
-      if (PsiType.LONG.equals(type) || PsiType.DOUBLE.equals(type)) {
-        registerFieldError(field, type);
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml b/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
index 8c01f575ae40..1009d0e9fcc5 100644
--- a/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
+++ b/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
@@ -2697,10 +2697,6 @@
     <localInspection groupPath="Java" language="JAVA" shortName="VolatileArrayField" bundle="com.siyeh.InspectionGadgetsBundle" key="volatile.array.field.display.name"
                      groupBundle="messages.InspectionsBundle" groupKey="group.names.threading.issues" enabledByDefault="false"
                      level="WARNING" implementationClass="com.siyeh.ig.threading.VolatileArrayFieldInspection"/>
-    <localInspection groupPath="Java" language="JAVA" shortName="VolatileLongOrDoubleField" bundle="com.siyeh.InspectionGadgetsBundle"
-                     key="volatile.long.or.double.field.display.name" groupBundle="messages.InspectionsBundle"
-                     groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
-                     implementationClass="com.siyeh.ig.threading.VolatileLongOrDoubleFieldInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="WaitCalledOnCondition" bundle="com.siyeh.InspectionGadgetsBundle"
                      key="wait.called.on.condition.display.name" groupBundle="messages.InspectionsBundle"
                      groupKey="group.names.threading.issues" enabledByDefault="false" level="WARNING"
diff --git a/plugins/InspectionGadgets/src/inspectionDescriptions/VolatileLongOrDoubleField.html b/plugins/InspectionGadgets/src/inspectionDescriptions/VolatileLongOrDoubleField.html
deleted file mode 100644
index f308712144eb..000000000000
--- a/plugins/InspectionGadgets/src/inspectionDescriptions/VolatileLongOrDoubleField.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<body>
-Reports fields of type <b>long</b> or <b>double</b>
-which are declared as <b>volatile</b>. While Java specifies that reads
-and writes from such fields are atomic, many JVMs have violated this specification. Unless you
-are certain of your JVM, it is better to synchronize access to such fields rather than declare them <b>volatile</b>.
-<!-- tooltip end -->
-<p>
-
-</body>
-</html>