diff --git a/device-common.mk b/device-common.mk
index 85f1387..fa7c78a 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -598,15 +598,3 @@
 # Vendor seccomp policy files for media components:
 PRODUCT_COPY_FILES += \
     device/google/marlin/seccomp_policy/mediacodec.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/mediacodec.policy
-
-# Get rid of dex preoptimization to save space within system_other.img at the
-# one time cost of dexing on first boot.  This list can be found by running:
-# grep odex $ANDROID_PRODUCT_OUT/installed-files-system-other.txt
-# Sorted by *.odex size
-MARLINSAILFISH_DONT_DEXPREOPT_MODULES := \
-    BetterBug \
-    CloudPrint2 \
-    Hangouts \
-    Volta \
-
-$(call add-product-dex-preopt-module-config,$(MARLINSAILFISH_DONT_DEXPREOPT_MODULES),disable)
diff --git a/device-marlin.mk b/device-marlin.mk
index 2e37809..c479692 100644
--- a/device-marlin.mk
+++ b/device-marlin.mk
@@ -72,3 +72,17 @@
 # Fingerprint
 PRODUCT_PACKAGES += \
     fingerprint.marlin
+
+# A/B experiment: the default preopt settings is to save on space and use
+# the 'interpret-only' compiler filter. Special case marlin for now to
+# use the old default of 'speed'.
+PRODUCT_DEX_PREOPT_DEFAULT_FLAGS := --compiler-filter=speed
+
+# Special case some packages to save space within system_other.img.
+SAVE_PREOPT_SPACE_PACKAGES := \
+    BetterBug \
+    CloudPrint2 \
+    Hangouts \
+    Volta \
+
+$(call add-product-dex-preopt-module-config,$(SAVE_PREOPT_SPACE_PACKAGES),--compiler-filter=interpret-only)