diff --git a/project/msm8974.mk b/project/msm8974.mk
index 2cbec50..6ffa254 100644
--- a/project/msm8974.mk
+++ b/project/msm8974.mk
@@ -15,6 +15,7 @@
 DEFINES += DEVICE_TREE=1
 #DEFINES += MMC_BOOT_BAM=1
 DEFINES += CRYPTO_BAM=1
+DEFINES += ABOOT_IGNORE_BOOT_HEADER_ADDRS=1
 
 #Disable thumb mode
 ENABLE_THUMB := false
@@ -23,11 +24,6 @@
 DEFINES += ABOOT_FORCE_RAMDISK_ADDR=0x02000000
 DEFINES += ABOOT_FORCE_TAGS_ADDR=0x01e00000
 
-# Right now we are assuming these are the only default values
-DEFINES += ABOOT_DEFAULT_KERNEL_ADDR=0x10008000
-DEFINES += ABOOT_DEFAULT_RAMDISK_ADDR=0x1100000
-DEFINES += ABOOT_DEFAULT_TAGS_ADDR=0x10000100
-
 ifeq ($(EMMC_BOOT),1)
 DEFINES += _EMMC_BOOT=1
 endif