diff --git a/build_library/disk_layout_util.sh b/build_library/disk_layout_util.sh
index 25114b5..daa435a 100644
--- a/build_library/disk_layout_util.sh
+++ b/build_library/disk_layout_util.sh
@@ -526,13 +526,11 @@
 build_gpt_image() {
   local outdev="$1"
   local disk_layout="$2"
-  local adjust_part="$3"
 
   # Build the partition table and partition script.
   local partition_script_path
   partition_script_path="$(dirname "${outdev}")/partition_script.sh"
-  write_partition_script "${disk_layout}" "${partition_script_path}" \
-    "${adjust_part}"
+  write_partition_script "${disk_layout}" "${partition_script_path}"
   run_partition_script "${outdev}" "${partition_script_path}"
 
   # Emit the gpt scripts so we can use them from here on out.
diff --git a/mod_image_for_recovery.sh b/mod_image_for_recovery.sh
index dd76aa7..f595907 100755
--- a/mod_image_for_recovery.sh
+++ b/mod_image_for_recovery.sh
@@ -387,11 +387,12 @@
   # with correct layout.
   rm -f "${dst_img}"
 
-  # Temporarily disable set -u because there's some empty array expansion in
-  # build_gpt_image.
-  set +u
-  build_gpt_image "${dst_img}" recovery "STATE:=$(( stateful_blocks * 512 ))"
-  set -u
+  # Build the partition table.
+  local partition_script_path
+  partition_script_path="$(dirname "${dst_img}")/partition_script.sh"
+  write_partition_script recovery "${partition_script_path}" \
+    "STATE:=$(( stateful_blocks * 512 ))"
+  run_partition_script "${dst_img}" "${partition_script_path}"
 }
 
 # Copy the partitions one by one from source image to destination image,