diff --git a/Android.mk b/Android.mk
index a682ef3..0f73b50 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,7 +21,7 @@
 
 LOCAL_MODULE := android.software.live_wallpaper.xml
 
-LOCAL_MODULE_TAGS := user
+#LOCAL_MODULE_TAGS := user
 
 LOCAL_MODULE_CLASS := ETC
 
@@ -31,7 +31,10 @@
 
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 
-include $(BUILD_PREBUILT)
+# XXX the intention is that this file be copied automatically when
+# LiveWallpaperPicker is being bundled with a system.  Unfortunately
+# it isn't working correctly (it always gets copied).
+#include $(BUILD_PREBUILT)
 
 ########################
 include $(CLEAR_VARS)
@@ -39,7 +42,7 @@
 #LOCAL_MODULE_TAGS := user
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_REQUIRES_MODULE := android.software.live_wallpaper.xml
+#LOCAL_REQUIRES_MODULE := android.software.live_wallpaper.xml
 
 LOCAL_PACKAGE_NAME := LiveWallpapersPicker
 LOCAL_CERTIFICATE := platform