diff --git a/core/config.mk b/core/config.mk
index a6e0c2ce07..d7e6f1e5a0 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -699,11 +699,7 @@ ANDROID_MANIFEST_MERGER := $(JAVA) \
 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 :=