Merge "Revert "Default to building with OpenJDK 9 -target 1.8.""
diff --git a/core/config.mk b/core/config.mk
index d4dae70..5fd2993 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -690,11 +690,7 @@
 COLUMN:= column
 
 ifeq ($(EXPERIMENTAL_USE_OPENJDK9),)
-ifeq ($(RUN_ERROR_PRONE),true)
 USE_OPENJDK9 :=
-else
-USE_OPENJDK9 := true
-endif
 TARGET_OPENJDK9 :=
 else ifeq ($(EXPERIMENTAL_USE_OPENJDK9),false)
 USE_OPENJDK9 :=