diff --git a/device.mk b/device.mk
index 700cee23..71de3785 100755
--- a/device.mk
+++ b/device.mk
@@ -585,10 +585,3 @@ PRODUCT_PROPERTY_OVERRIDES += \
 PRODUCT_COPY_FILES += \
     device/google/wahoo/permissions/com.google.hardware.camera.easel.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.google.hardware.camera.easel.xml
 
-# Add minidebug info to the system server to support diagnosing native crashes.
-ifneq (,$(filter user userdebug, $(TARGET_BUILD_VARIANT)))
-    # System server and some of its services.
-    # Note: we cannot use PRODUCT_SYSTEM_SERVER_JARS, as it has not been expanded at this point.
-    $(call add-product-dex-preopt-module-config,services,--generate-mini-debug-info)
-    $(call add-product-dex-preopt-module-config,wifi-service,--generate-mini-debug-info)
-endif