diff --git a/core/binary.mk b/core/binary.mk
index 5d02b95e660..a797c807a67 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -45,8 +45,7 @@ endif
 my_soong_problems :=
 
 # Automatically replace the old-style kernel header include with a dependency
-# on the generated_kernel_headers header library when building inline
-ifeq ($(INLINE_KERNEL_BUILDING),true)
+# on the generated_kernel_headers header library
 ifneq (,$(findstring $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include,$(LOCAL_C_INCLUDES)))
   LOCAL_C_INCLUDES := $(patsubst $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include,,$(LOCAL_C_INCLUDES))
   LOCAL_HEADER_LIBRARIES += generated_kernel_headers
@@ -65,12 +64,6 @@ ifneq (,$(findstring $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr,$(LOCAL_ADDITION
   LOCAL_ADDITIONAL_DEPENDENCIES := $(patsubst $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr,,$(LOCAL_ADDITIONAL_DEPENDENCIES))
 endif
 
-# Replace device_kernel_headers with generated_kernel_headers
-ifneq (,$(findstring device_kernel_headers,$(LOCAL_HEADER_LIBRARIES)))
-  LOCAL_HEADER_LIBRARIES := $(patsubst device_kernel_headers,generated_kernel_headers,$(LOCAL_HEADER_LIBRARIES))
-endif
-endif
-
 # The following LOCAL_ variables will be modified in this file.
 # Because the same LOCAL_ variables may be used to define modules for both 1st arch and 2nd arch,
 # we can't modify them in place.
diff --git a/envsetup.sh b/envsetup.sh
index 901c5ca1d67..ffde112567c 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -866,13 +866,6 @@ function lunch()
         cd - > /dev/null
     fi
 
-    local prebuilt_kernel=$(get_build_var TARGET_PREBUILT_KERNEL)
-    if [ -z "$prebuilt_kernel" ]; then
-      export INLINE_KERNEL_BUILDING=true
-    else
-      unset INLINE_KERNEL_BUILDING
-    fi
-
     [[ -n "${ANDROID_QUIET_BUILD:-}" ]] || echo
 
     fixup_common_out_dir