diff --git a/core/main.mk b/core/main.mk
index 920548d88..2d62b66ae 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -688,8 +688,8 @@ ifneq ($(TARGET_BUILD_APPS),)
 
   unbundled_build_modules :=
   ifneq ($(filter all,$(TARGET_BUILD_APPS)),)
-    # If they used the magic goal "all" then build everything
-    unbundled_build_modules := $(sort $(call get-tagged-modules,$(ALL_MODULE_TAGS)))
+    # If they used the magic goal "all" then build all apps in the source tree.
+    unbundled_build_modules := $(foreach m,$(sort $(ALL_MODULES)),$(if $(filter APPS,$(ALL_MODULES.$(m).CLASS)),$(m)))
   else
     unbundled_build_modules := $(TARGET_BUILD_APPS)
   endif
diff --git a/envsetup.sh b/envsetup.sh
index b2415e0b3..d79428134 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -559,6 +559,9 @@ function tapas()
     if [ -z "$variant" ]; then
         variant=eng
     fi
+    if [ -z "$apps" ]; then
+        apps=all
+    fi
 
     export TARGET_PRODUCT=generic
     export TARGET_BUILD_VARIANT=$variant