diff --git a/config/common.mk b/config/common.mk
index e45f96d..9cf6a6f 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -22,12 +22,8 @@
     ro.url.legal=http://www.google.com/intl/%s/mobile/android/basic/phone-legal.html \
     ro.com.android.wifi-watchlist=GoogleGuest \
     ro.setupwizard.enterprise_mode=1 \
-    ro.build.selinux=1
-
-# enable ADB authentication if not on eng build
-ifneq ($(TARGET_BUILD_VARIANT),eng)
-PRODUCT_DEFAULT_PROPERTY_OVERRIDES  += ro.adb.secure=1
-endif
+    ro.build.selinux=1 \
+    persist.sys.disable_rescue=true
 
 # Backup Tool
 PRODUCT_COPY_FILES += \