Rollback of commit 156adeec613ab140a91d73e1147bc688689bcfb7.

*** Reason for rollback ***

Breaks Bazel on JDK 7: http://ci.bazel.io/view/Dashboard/job/bazel-tests/BAZEL_VERSION=HEAD-jdk7,PLATFORM_NAME=linux-x86_64/475/console

*** Original change description ***

Automated [] rollback of commit 5163ec2c0db8fbdc7f367bb4aca5b6d7ae6d80b0.

*** Reason for rollback ***

See unknown commit

*** Original change description ***

Automated [] rollback of commit c9dbd4c1a4a4b4345c0b3924f86e01612ae12807.

*** Reason for rollback ***

Breaks bazel-docker-tests

http://ci.bazel.io/view/Dashboard/job/bazel-docker-tests/lastCompletedBuild/BAZEL_VERSION=HEAD,PLATFORM_NAME=docker/console

*** Original change description ***

Enable header compilation by default

--
PiperOrigin-RevId: 144443446
MOS_MIGRATED_REVID=144443446
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
index a4fc89c..8924e00 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
@@ -165,7 +165,7 @@
 
   @Option(
     name = "java_header_compilation",
-    defaultValue = "true",
+    defaultValue = "false",
     category = "semantics",
     help = "Compile ijars directly from source.",
     oldName = "experimental_java_header_compilation"
diff --git a/tools/jdk/BUILD b/tools/jdk/BUILD
index 1ec5d87..badd086 100644
--- a/tools/jdk/BUILD
+++ b/tools/jdk/BUILD
@@ -117,9 +117,6 @@
         "-XX:+TieredCompilation",
         "-XX:TieredStopAtLevel=1",
     ],
-    misc = [
-        "-XDskipDuplicateBridges=true",
-    ],
     singlejar = ["//tools/jdk:SingleJar_deploy.jar"],
     source_version = "8",
     target_version = "8",