diff --git a/core/main.mk b/core/main.mk
index a07172d..9986f94 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -252,8 +252,6 @@
 ADDITIONAL_BUILD_PROPERTIES += xmpp.auto-presence=true
 ADDITIONAL_BUILD_PROPERTIES += ro.config.nocheckin=yes
 else # !sdk
-# Enable sync for non-sdk builds only (sdk builds lack SubscribedFeedsProvider).
-ADDITIONAL_BUILD_PROPERTIES += ro.config.sync=yes
 endif
 
 ## precise GC ##
@@ -288,6 +286,7 @@
 endif
 
 ADDITIONAL_BUILD_PROPERTIES += net.bt.name=Android
+ADDITIONAL_BUILD_PROPERTIES += ro.config.sync=yes
 
 # enable vm tracing in files for now to help track
 # the cause of ANRs in the content process
diff --git a/target/product/generic.mk b/target/product/generic.mk
index e7c1e7b..b4b1b09 100644
--- a/target/product/generic.mk
+++ b/target/product/generic.mk
@@ -3,6 +3,7 @@
 # you should derive from generic_with_google.mk
 
 PRODUCT_PACKAGES := \
+    AccountAndSyncSettings \
     AlarmClock \
     AlarmProvider \
     Bluetooth \
@@ -20,7 +21,6 @@
     Sync \
     Updater \
     CalendarProvider \
-    SubscribedFeedsProvider \
     SyncProvider
 
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core.mk)
diff --git a/target/product/sdk.mk b/target/product/sdk.mk
index 210bd9c..f35de85 100644
--- a/target/product/sdk.mk
+++ b/target/product/sdk.mk
@@ -1,6 +1,7 @@
 PRODUCT_PROPERTY_OVERRIDES :=
 
 PRODUCT_PACKAGES := \
+	AccountAndSyncSettings \
 	AlarmClock \
 	Camera \
 	Calculator \