diff --git a/extract-files.sh b/extract-files.sh
index 07066e5..14c13e0 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -16,10 +16,6 @@ if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
 
 ANDROID_ROOT="${MY_DIR}/../../.."
 
-# If XML files don't have comments before the XML header, use this flag
-# Can still be used with broken XML files by using blob_fixup
-export TARGET_DISABLE_XML_FIXING=true
-
 HELPER="${ANDROID_ROOT}/tools/extract-utils/extract_utils.sh"
 if [ ! -f "${HELPER}" ]; then
     echo "Unable to find helper script at ${HELPER}"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 11c7733..6fef958 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -29,7 +29,7 @@ setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}"
 # Warning headers and guards
 write_headers
 
-write_makefiles "${MY_DIR}/proprietary-files.txt" true
+write_makefiles "${MY_DIR}/proprietary-files.txt"
 
 # Finish
 write_footers