diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index b145f91f9828296e15e479fb6d707e6478672f06..2c5cc0d2625d4437f6475e8a89432e188094ee29 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -109,11 +109,11 @@ TARGET_HW_DISK_ENCRYPTION := true
 ifeq ($(HOST_OS),linux)
   ifneq ($(TARGET_BUILD_VARIANT),eng)
     ifeq ($(WITH_DEXPREOPT),)
+      WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false
       WITH_DEXPREOPT := true
     endif
   endif
 endif
-WITH_DEXPREOPT_BOOT_IMG_ONLY ?= true
 
 # Display
 MAX_VIRTUAL_DISPLAY_DIMENSION := 4096