diff --git a/tools/jdk/default_java_toolchain.bzl b/tools/jdk/default_java_toolchain.bzl
index ac8ed5d8828a49..ed64035b5e148b 100644
--- a/tools/jdk/default_java_toolchain.bzl
+++ b/tools/jdk/default_java_toolchain.bzl
@@ -51,8 +51,8 @@ DEFAULT_JAVACOPTS = [
     "-XDcompilePolicy=simple",
     "-g",
     "-parameters",
-    # https://github.com/bazelbuild/java_tools/issues/51#issuecomment-927940699
-    "-XepOpt:ReturnValueIgnored:ObjectMethods=false",
+    # https://github.com/bazelbuild/bazel/issues/15219
+    "-Xep:ReturnValueIgnored:OFF",
 ]
 
 # java_toolchain parameters without specifying javac, java.compiler,