diff --git a/etc/ipxe/default.ipxe b/etc/ipxe/default.ipxe
index 4b262684..d5f85a57 100644
--- a/etc/ipxe/default.ipxe
+++ b/etc/ipxe/default.ipxe
@@ -19,40 +19,40 @@ echo Warewulf Controller: {{.Ipaddr}}
 echo Downloading Kernel Image:
 kernel --name kernel ${uri_base}&stage=kernel       || goto reboot
 
-# try extracting compressed images first
-# NOTE: system overlay tends to be the smallest, so failure here is the cheapest
+## try extracting compressed images first
+## NOTE: system overlay tends to be the smallest, so failure here is the cheapest
+#echo Downloading Container Image:
+#imgextract --name container ${uri_base}&stage=container&compress=gz || goto nocompress
+#
+#echo Downloading System Overlay:
+#imgextract --name system ${uri_base}&stage=system&compress=gz       || goto reboot
+#
+#echo Downloading Runtime Overlay:
+#imgextract --name runtime ${uri_base}&stage=runtime&compress=gz     || goto reboot
+#
+#{{if ne .KernelOverride "" -}}
+#echo Downloading Kernel Modules:
+#imgextract --name kmods ${uri_base}&stage=kmods&compress=gz         || goto reboot
+#{{- end}}
+#
+#goto imoktogo
+#
+#:nocompress
+#
+#echo Extraction failed, attempting un-compressed version of images
+
 echo Downloading Container Image:
-imgextract --name container ${uri_base}&stage=container&compress=gz || goto nocompress
+initrd --name container ${uri_base}&stage=container&compress=gz     || goto reboot
 
 echo Downloading System Overlay:
-imgextract --name system ${uri_base}&stage=system&compress=gz       || goto reboot
+initrd --name system ${uri_base}&stage=system&compress=gz           || goto reboot
 
 echo Downloading Runtime Overlay:
-imgextract --name runtime ${uri_base}&stage=runtime&compress=gz   || goto reboot
+initrd --name runtime ${uri_base}&stage=runtime&compress=gz         || goto reboot
 
 {{if ne .KernelOverride "" -}}
 echo Downloading Kernel Modules:
-imgextract --name kmods ${uri_base}&stage=kmods&compress=gz         || goto reboot
-{{- end}}
-
-goto imoktogo
-
-:nocompress
-
-echo Extraction failed, attempting un-compressed version of images
-
-echo Downloading Container Image:
-initrd --name container ${uri_base}&stage=container     || goto reboot
-
-echo Downloading System Overlay:
-initrd --name system ${uri_base}&stage=system           || goto reboot
-
-echo Downloading Runtime Overlay:
-initrd --name runtime ${uri_base}&stage=runtime           || goto reboot
-
-{{if ne .KernelOverride "" -}}
-echo Downloading Kernel Modules:
-initrd --name kmods ${uri_base}&stage=kmods             || goto reboot
+initrd --name kmods ${uri_base}&stage=kmods&compress=gz             || goto reboot
 {{- end}}