diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index 2324a11d..c12b1566 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -7,9 +7,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.notification_sound=Argon.ogg \
     ro.config.alarm_alert=Hassium.ogg
 
-PRODUCT_PACKAGES += \
-  Mms
-
 ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
     PRODUCT_COPY_FILES += \
         vendor/cm/prebuilt/common/bootanimation/480.zip:system/media/bootanimation.zip
diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk
index 7589dad8..5c46f7da 100644
--- a/config/common_mini_phone.mk
+++ b/config/common_mini_phone.mk
@@ -13,9 +13,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.notification_sound=Argon.ogg \
     ro.config.alarm_alert=Hassium.ogg
 
-PRODUCT_PACKAGES += \
-  Mms
-
 ifeq ($(TARGET_SCREEN_WIDTH) $(TARGET_SCREEN_HEIGHT),$(space))
     PRODUCT_COPY_FILES += \
         vendor/cm/prebuilt/common/bootanimation/320.zip:system/media/bootanimation.zip
diff --git a/config/telephony.mk b/config/telephony.mk
index 3beaf0df..5f35a4a0 100644
--- a/config/telephony.mk
+++ b/config/telephony.mk
@@ -8,5 +8,5 @@ PRODUCT_COPY_FILES += \
 
 # SIM Toolkit
 PRODUCT_PACKAGES += \
+    Mms \
     Stk
-