diff --git a/core/main.mk b/core/main.mk
index 78acde4..aed777c 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -597,11 +597,12 @@
   # The base list of modules to build for this product is specified
   # by the appropriate product definition file, which was included
   # by product_config.make.
-  product_MODULES := $(call module-installed-files, \
-                       $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES))
+  product_MODULES := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES)
+  $(call expand-required-modules,product_MODULES,$(product_MODULES))
+  product_FILES := $(call module-installed-files, $(product_MODULES))
   ifeq (0,1)
-    $(info product_MODULES for $(TARGET_DEVICE) ($(INTERNAL_PRODUCT)):)
-    $(foreach p,$(product_MODULES),$(info :   $(p)))
+    $(info product_FILES for $(TARGET_DEVICE) ($(INTERNAL_PRODUCT)):)
+    $(foreach p,$(product_FILES),$(info :   $(p)))
     $(error done)
   endif
 else
@@ -609,7 +610,7 @@
   # a subset of the module makefiles.  Don't try to build any modules
   # requested by the product, because we probably won't have rules
   # to build them.
-  product_MODULES :=
+  product_FILES :=
 endif
 
 eng_MODULES := $(sort \
@@ -630,7 +631,7 @@
 # TODO: The shell is chosen by magic.  Do we still need this?
 modules_to_install := $(sort \
     $(ALL_DEFAULT_INSTALLED_MODULES) \
-    $(product_MODULES) \
+    $(product_FILES) \
     $(foreach tag,$(tags_to_install),$($(tag)_MODULES)) \
     $(call get-tagged-modules, shell_$(TARGET_SHELL)) \
     $(CUSTOM_MODULES) \
diff --git a/target/product/core.mk b/target/product/core.mk
index ee876e3..d0f4093 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -22,7 +22,7 @@
     ro.config.notification_sound=OnTheHunt.ogg \
     ro.config.alarm_alert=Alarm_Classic.ogg
 
-# Core modules (will move elsewhere)
+# Core modules (will move elsewhere, previously user tagged)
 PRODUCT_PACKAGES := \
     20-dns.conf \
     95-configured \
@@ -36,6 +36,7 @@
     bmgr \
     bootanimation \
     bugreport \
+    content \
     dbus-daemon \
     debuggerd \
     dhcpcd \
@@ -51,7 +52,6 @@
     init \
     input \
     javax.obex \
-    keystore \
     libEGL \
     libETC1 \
     libFFTEm \
@@ -77,7 +77,6 @@
     libdrm1 \
     libdrm1_jni \
     libeffects \
-    libexif \
     libgui \
     libhardware \
     libhardware_legacy \
@@ -104,7 +103,6 @@
     libsonivox \
     libsoundpool \
     libsqlite \
-    libsrec_jni \
     libstagefright \
     libstagefright_amrnb_common \
     libstagefright_avc_common \
@@ -135,13 +133,11 @@
     ndc \
     netcfg \
     netd \
-    omx_tests \
     ping \
     platform.xml \
     pppd \
     pm \
     racoon \
-    rild \
     run-as \
     schedtest \
     screenshot \
@@ -149,7 +145,6 @@
     service \
     servicemanager \
     services \
-    simg2img \
     surfaceflinger \
     svc \
     system_server \