diff --git a/src/system/boot/loader/loader.cpp b/src/system/boot/loader/loader.cpp
index bfdd8620d3..6fa947c87c 100644
--- a/src/system/boot/loader/loader.cpp
+++ b/src/system/boot/loader/loader.cpp
@@ -258,31 +258,11 @@ load_modules(stage2_args* args, BootVolume& volume)
 	}
 
 	// and now load all partitioning and file system modules
-	// needed to identify the boot volume
-
-	if (!gBootVolume.GetBool(BOOT_VOLUME_BOOTED_FROM_IMAGE, false)
-		&& gBootVolume.GetInt32(BOOT_METHOD, BOOT_METHOD_DEFAULT)
-			!= BOOT_METHOD_CD) {
-		// iterate over the mounted volumes and load their file system
-		Partition *partition;
-		if (gRoot->GetPartitionFor(volume.RootDirectory(), &partition)
-				== B_OK) {
-			while (partition != NULL) {
-				load_module(volume, partition->ModuleName());
-				partition = partition->Parent();
-			}
-		}
-	} else {
-		// The boot image should only contain the file system
-		// needed to boot the system, so we just load it.
-		// ToDo: this is separate from the fall back from above
-		//	as this piece will survive a more intelligent module
-		//	loading approach...
-		char path[B_FILE_NAME_LENGTH];
-		snprintf(path, sizeof(path), "%s/%s", sAddonPaths[0], "file_systems");
-		load_modules_from(volume, path);
-	}
+	char path[B_FILE_NAME_LENGTH];
+	snprintf(path, sizeof(path), "%s/%s", sAddonPaths[0], "file_systems");
+	load_modules_from(volume, path);
+	snprintf(path, sizeof(path), "%s/%s", sAddonPaths[0], "partitioning_systems");
+	load_modules_from(volume, path);
 
 	return B_OK;
 }
-