diff --git a/products/common.mk b/products/common.mk
index 9573a256..d001e9bc 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -35,11 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.com.android.dateformat=MM-dd-yyyy \
     ro.com.android.dataroaming=false
 
-# ADWLauncher is the default unless specified elsewhere
-ifndef DEFAULT_LAUNCHER
-    PRODUCT_PACKAGES += ADWLauncher
-endif
-
 # CyanogenMod specific product packages
 PRODUCT_PACKAGES += \
     CMParts \
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index 1cfe45fd..f97701ac 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -40,3 +40,7 @@ endif
 #
 PRODUCT_COPY_FILES +=  \
     vendor/cyanogen/prebuilt/passion/media/bootanimation.zip:system/media/bootanimation.zip
+
+ifndef DEFAULT_LAUNCHER
+    PRODUCT_PACKAGES += ADWLauncher
+endif
\ No newline at end of file
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index 238c2b68..d2684d19 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -45,3 +45,6 @@ endif
 PRODUCT_COPY_FILES +=  \
     vendor/cyanogen/prebuilt/dream_sapphire/media/bootanimation.zip:system/media/bootanimation.zip
 
+ifndef DEFAULT_LAUNCHER
+    PRODUCT_PACKAGES += ADWLauncher
+endif
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index bd06f35a..d61491fc 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -39,3 +39,7 @@ endif
 #
 PRODUCT_COPY_FILES +=  \
     vendor/cyanogen/prebuilt/espresso/media/bootanimation.zip:system/media/bootanimation.zip
+
+ifndef DEFAULT_LAUNCHER
+    PRODUCT_PACKAGES += ADWLauncher
+endif
\ No newline at end of file
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
index 1eb3ebcc..2e107643 100644
--- a/products/cyanogen_hero.mk
+++ b/products/cyanogen_hero.mk
@@ -38,3 +38,6 @@ endif
 PRODUCT_COPY_FILES +=  \
     vendor/cyanogen/prebuilt/dream_sapphire/media/bootanimation.zip:system/media/bootanimation.zip
 
+ifndef DEFAULT_LAUNCHER
+    PRODUCT_PACKAGES += ADWLauncher
+endif
\ No newline at end of file
diff --git a/products/cyanogen_inc.mk b/products/cyanogen_inc.mk
index cac14a86..3c7d92cb 100644
--- a/products/cyanogen_inc.mk
+++ b/products/cyanogen_inc.mk
@@ -22,3 +22,7 @@ else
     PRODUCT_PROPERTY_OVERRIDES += \
         ro.modversion=CyanogenMod-6.0.0-N1-test0
 endif
+
+ifndef DEFAULT_LAUNCHER
+    PRODUCT_PACKAGES += ADWLauncher
+endif
\ No newline at end of file
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 07ec514e..873c6b86 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -48,3 +48,7 @@ endif
 #
 PRODUCT_COPY_FILES +=  \
     vendor/cyanogen/prebuilt/passion/media/bootanimation.zip:system/media/bootanimation.zip
+
+ifndef DEFAULT_LAUNCHER
+    PRODUCT_PACKAGES += ADWLauncher
+endif
\ No newline at end of file
diff --git a/products/cyanogen_sholes.mk b/products/cyanogen_sholes.mk
index 6b308198..095f3288 100644
--- a/products/cyanogen_sholes.mk
+++ b/products/cyanogen_sholes.mk
@@ -1,8 +1,6 @@
 # Inherit AOSP device configuration for passion.
 $(call inherit-product, device/motorola/sholes/sholes.mk)
 
-PRODUCT_SPECIFIC_DEFINES += DEFAULT_LAUNCHER=true
-
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common.mk)
 
@@ -26,7 +24,7 @@ ifdef CYANOGEN_NIGHTLY
         ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-Droid
 else
     PRODUCT_PROPERTY_OVERRIDES += \
-        ro.modversion=CyanogenMod-6.0.0-Droid-alpha4
+        ro.modversion=CyanogenMod-6.0.0-Droid-alpha6
 endif
 
 PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRF84B BUILD_DISPLAY_ID=FRF84B PRODUCT_NAME=voles TARGET_DEVICE=sholes BUILD_FINGERPRINT=verizon/voles/sholes/sholes:2.2/FRF84B/42477:user/release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="voles-user 2.2 FRF84B 42477 release-keys" BUILD_NUMBER=42477 BUILD_UTC_DATE=1277333704 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build