Index: kernel/generic/src/proc/program.c
===================================================================
--- kernel/generic/src/proc/program.c	(revision eadaeae8dacc68cf558028f23cc96b90a08b7361)
+++ kernel/generic/src/proc/program.c	(revision 1abcf1db7c2a8071caaf9983f1571b2ef88e1be6)
@@ -143,21 +143,10 @@
 		return ENOMEM;
 
-	prg->loader_status = elf_load((elf_header_t *) image_addr, as, 0);
+	prg->loader_status = elf_load((elf_header_t *) image_addr, as);
 	if (prg->loader_status != EE_OK) {
 		as_destroy(as);
 		prg->task = NULL;
 		prg->main_thread = NULL;
-
-		if (prg->loader_status != EE_LOADER)
-			return ENOTSUP;
-
-		/* Register image as the program loader */
-		if (program_loader != NULL)
-			return ELIMIT;
-
-		program_loader = image_addr;
-		log(LF_OTHER, LVL_NOTE, "Program loader at %p", (void *) image_addr);
-
-		return EOK;
+		return ENOTSUP;
 	}
 
@@ -188,6 +177,5 @@
 	}
 
-	prg->loader_status = elf_load((elf_header_t *) program_loader, as,
-	    ELD_F_LOADER);
+	prg->loader_status = elf_load((elf_header_t *) program_loader, as);
 	if (prg->loader_status != EE_OK) {
 		as_destroy(as);