diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
index 6dee2188751..8b3ba741178 100644
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -909,20 +909,6 @@ main(int argc, CHAR16 *argv[])
 	howto &= ~RB_PROBE;
 	uhowto = parse_uefi_con_out();
 
-	/*
-	 * Scan the BLOCK IO MEDIA handles then
-	 * march through the device switch probing for things.
-	 */
-	i = efipart_inithandles();
-	if (i != 0 && i != ENOENT) {
-		printf("efipart_inithandles failed with ERRNO %d, expect "
-		    "failures\n", i);
-	}
-
-	for (i = 0; devsw[i] != NULL; i++)
-		if (devsw[i]->dv_init != NULL)
-			(devsw[i]->dv_init)();
-
 	/*
 	 * Read additional environment variables from the boot device's
 	 * "LoaderEnv" file. Any boot loader environment variable may be set