diff --git a/pom.xml b/pom.xml
index 5e39787ef27d..7db03f566d99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1813,15 +1813,13 @@
                                 <arg>-XDcompilePolicy=simple</arg>
                                 <arg>
                                     -Xplugin:ErrorProne \
-                                    <!-- -Xep:ReferenceEquality:OFF fails in IDEA --> \
-                                    <!-- -Xep:BoxedPrimitiveEquality:OFF fails in IDEA --> \
-                                    -Xep:GuardedBy:OFF <!-- needs some careful inspection --> \
                                     -Xep:BadInstanceof:ERROR \
                                     -Xep:BoxedPrimitiveConstructor:ERROR \
                                     -Xep:ClassCanBeStatic:ERROR \
                                     -Xep:CompareToZero:ERROR \
                                     -Xep:EqualsIncompatibleType:ERROR \
                                     -Xep:FallThrough:ERROR \
+                                    -Xep:GuardedBy:OFF <!-- needs some careful inspection --> \
                                     -Xep:ImmutableSetForContains:ERROR \
                                     -Xep:InconsistentHashCode:ERROR \
                                     -Xep:InjectOnConstructorOfAbstractClass:ERROR \