diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d78ecfe..7e51f0d 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -830,9 +830,10 @@ choose_keymap() {
 }
 
 # This helper function is to be called using call_func_timeout.
-# It enables us to wait a reasonable amount of time until /dev/zfs appears.
+# This works around the inability of busybox modprobe to handle complex module dependencies.
+# This also enables us to wait a reasonable amount of time until /dev/zfs appears.
 waitForZFS() {
-	while [ ! -c /dev/zfs ]; do echo >/dev/null; done;
+	while [ ! -c /dev/zfs ]; do modprobe zfs 2> /dev/null; done;
 }
 
 start_volumes() {
diff --git a/defaults/linuxrc b/defaults/linuxrc
index 5bc70a3..7b66d52 100644
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -299,8 +299,6 @@ then
 			break
 		fi
 	done
-
-	[ "USE_ZFS" = "1" ] && MY_HWOPTS="${MY_HWOPTS} zfs"
 fi
 
 cmdline_hwopts