diff --git a/core/envsetup.mk b/core/envsetup.mk
index da9dd28cfa..2142439459 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -119,6 +119,11 @@ else
   HOST_PREBUILT_TAG := $(HOST_OS)-$(HOST_ARCH)
 endif
 
+# Build dalvikvm on hosts that support it
+ifeq ($(HOST_OS),linux)
+	WITH_HOST_DALVIK := true
+endif
+
 
 # ---------------------------------------------------------------
 # Set up configuration for target machine.
diff --git a/core/main.mk b/core/main.mk
index 37ac39ea97..ce74dbd8ee 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -225,11 +225,6 @@ ifneq (,$(user_variant))
     WITH_DEXPREOPT := true
   endif
 
-  # TODO: Always set WITH_HOST_DALVIK (for user builds) once it works on OSX.
-  ifeq ($(HOST_OS),linux)
-    WITH_HOST_DALVIK := true
-  endif
-
   # Disallow mock locations by default for user builds
   ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0
 
diff --git a/target/product/core.mk b/target/product/core.mk
index e8346f1743..22f388b62d 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -74,14 +74,6 @@ PRODUCT_PACKAGES := \
     Bugreport \
     ip
 
-# force WITH_HOST_DALVIK on userdebug and user builds.
-# TODO: this is redundant with a similar clause in build/core/main.mk.
-ifneq (,$(filter userdebug user,$(TARGET_BUILD_VARIANT)))
-  ifeq ($(HOST_OS),linux)
-    WITH_HOST_DALVIK := true
-  endif
-endif
-
 # host-only dependencies
 ifeq ($(WITH_HOST_DALVIK),true)
     PRODUCT_PACKAGES += \