diff --git a/config/common.mk b/config/common.mk
index f4a5de51..d22c935d 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -150,7 +150,8 @@ PRODUCT_PACKAGES += \
     CMUpdater \
     CMAccount \
     CMHome \
-    CyanogenSetupWizard
+    CyanogenSetupWizard \
+    CMSettingsProvider
 
 # CM Platform Library
 PRODUCT_PACKAGES += \
diff --git a/config/common_full.mk b/config/common_full.mk
index 22d25e15..5d125505 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -16,8 +16,7 @@ PRODUCT_PACKAGES += \
     VisualizationWallpapers \
     PhotoTable \
     SoundRecorder \
-    PhotoPhase \
-    CMSettingsProvider
+    PhotoPhase
 
 # Extra tools in CM
 PRODUCT_PACKAGES += \