diff --git a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml b/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
index bdb2936..7be2e5f 100644
--- a/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/utils/emulator/overlay/frameworks/base/core/res/res/values/config.xml
@@ -28,7 +28,4 @@
     with active proximity sensor event listener -->
     <bool name="config_proxiSensorWakupCheck">true</bool>
     <bool name="config_showNavigationBar">true</bool>
-    <!-- let people decide if they want keyguard shortcuts or not -->
-    <bool name="config_keyguardShowLeftAffordance">true</bool>
-    <bool name="config_keyguardShowCameraAffordance">true</bool>
 </resources>
diff --git a/utils/emulator/packages.mk b/utils/emulator/packages.mk
index 1a29c63..40b699d 100644
--- a/utils/emulator/packages.mk
+++ b/utils/emulator/packages.mk
@@ -10,9 +10,7 @@
     Phonograph \
     MatLog \
     OmniChange \
-    GoldfishParts
-
-#PRODUCT_PACKAGES += \
+    GoldfishParts \
     OpenDelta
 
 # Themes