--- linux-info.eclass.orig	2014-05-08 14:18:19.916399472 -0400
+++ linux-info.eclass	2014-05-08 14:46:48.691834174 -0400
@@ -400,21 +400,6 @@
 	echo ${x}
 }
 
-# Check if the Makefile is valid for direct parsing.
-# Check status results:
-# - PASS, use 'getfilevar' to extract values
-# - FAIL, use 'getfilevar_noexec' to extract values
-# The check may fail if:
-# - make is not present
-# - corruption exists in the kernel makefile
-get_makefile_extract_function() {
-	local a='' b='' mkfunc='getfilevar'
-	a="$(getfilevar VERSION ${KERNEL_MAKEFILE})"
-	b="$(getfilevar_noexec VERSION ${KERNEL_MAKEFILE})"
-	[[ "${a}" != "${b}" ]] && mkfunc='getfilevar_noexec'
-	echo "${mkfunc}"
-}
-
 # internal variable, so we know to only print the warning once
 get_version_warning_done=
 
@@ -493,14 +478,6 @@
 	# keep track of it
 	KERNEL_MAKEFILE="${KV_DIR}/Makefile"
 
-	if [[ -z ${OUTPUT_DIR} ]]; then
-		# Decide the function used to extract makefile variables.
-		local mkfunc=$(get_makefile_extract_function "${KERNEL_MAKEFILE}")
-
-		# And if we didn't pass it, we can take a nosey in the Makefile.
-		OUTPUT_DIR=$(${mkfunc} KBUILD_OUTPUT "${KERNEL_MAKEFILE}")
-	fi
-
 	# And contrary to existing functions I feel we shouldn't trust the
 	# directory name to find version information as this seems insane.
 	# So we parse ${KERNEL_MAKEFILE}.  We should be able to trust that