diff --git a/m1n1-raw.ld b/m1n1-raw.ld
index c35daade..61c51df3 100644
--- a/m1n1-raw.ld
+++ b/m1n1-raw.ld
@@ -2,8 +2,6 @@ ENTRY(_start)
 
 _stack_size = 0x20000;
 
-_max_payload_size = 64*1024*1024;
-
 /* We are actually relocatable */
 . = 0;
 
@@ -81,7 +79,6 @@ SECTIONS {
     _data_size = . - _data_start;
     _end = .;
     _payload_start = .;
-    _payload_end = . + _max_payload_size;
 
     .symtab 0 : { *(.symtab) }
     .strtab 0 : { *(.strtab) }
diff --git a/src/heapblock.c b/src/heapblock.c
index c4ddc6bf..5f07f442 100644
--- a/src/heapblock.c
+++ b/src/heapblock.c
@@ -20,13 +20,8 @@ static void *heap_base;
 void heapblock_init(void)
 {
     void *top_of_kernel_data = (void *)cur_boot_args.top_of_kernel_data;
-    void *payload_end = _payload_end;
-
-    if (payload_end > top_of_kernel_data)
-        heap_base = payload_end; // Chainloaded, we are last in RAM
-    else
-        heap_base = top_of_kernel_data; // Loaded by iBoot, there is data after us in RAM
 
+    heap_base = top_of_kernel_data;
     heapblock_alloc(0); // align base
 
     printf("Heap base: %p\n", heap_base);