diff --git a/core/config.mk b/core/config.mk
index bf567d0..f557698 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -58,6 +58,9 @@
 # If a rule fails, delete $@.
 .DELETE_ON_ERROR:
 
+# Mark variables deprecated/obsolete
+$(KATI_deprecated_var PATH,Do not use PATH directly)
+
 # Used to force goals to build.  Only use for conditionally defined goals.
 .PHONY: FORCE
 FORCE:
@@ -860,17 +863,6 @@
 APPS_DEFAULT_VERSION_NAME := $(PLATFORM_VERSION)
 endif
 
-# Put java first on the path
-# TODO(ccross): remove this once tools run during the build no longer depend on
-# finding java in the path
-ifeq (,$(strip $(CALLED_FROM_SETUP)))
-  ifneq ($(shell which java),$(abspath $(ANDROID_JAVA_TOOLCHAIN)/java))
-    $(warning Found incorrect java $(shell which java) in $$PATH)
-    $(warning Adding $(abspath $(ANDROID_JAVA_TOOLCHAIN)) to $$PATH)
-    export PATH:=$(abspath $(ANDROID_JAVA_TOOLCHAIN)):$(PATH)
-  endif
-endif
-
 # Projects clean of compiler warnings should be compiled with -Werror.
 # If most modules in a directory such as external/ have warnings,
 # the directory should be in ANDROID_WARNING_ALLOWED_PROJECTS list.