diff --git a/config/common.mk b/config/common.mk
index 75849444..86272d81 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -145,7 +145,7 @@ PRODUCT_PACKAGES += \
 PRODUCT_PACKAGES += \
     librsjni
 
-# Custom CM packages
+# Custom packages
 PRODUCT_PACKAGES += \
     Launcher3 \
     Trebuchet \
@@ -154,7 +154,6 @@ PRODUCT_PACKAGES += \
     CMFileManager \
     Eleven \
     LockClock \
-    CyanogenSetupWizard \
     CMSettingsProvider \
     ExactCalculator
 
diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index cafca3c5..3f6a6ec9 100644
--- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -18,7 +18,7 @@
 -->
 <resources>
     <string name="def_backup_transport">com.google.android.gms/.backup.BackupTransportService</string>
-
+    <bool name="def_install_non_market_apps">true</bool>
     <!-- Enable notification counters in statusbar -->
     <integer name="def_notif_count">1</integer>
 </resources>