diff --git a/debian/changelog b/debian/changelog
index 32a9298b..c2c51c3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,10 @@ livecd-rootfs (2.454) UNRELEASED; urgency=medium
   * live-build/ubuntu-cpc/functions: Remove umount_settle function.
     The was only used where teardown_mountpoint was lacking.
 
+  [ Steve Langasek ]
+  * Also adjust live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+    to use teardown_mountpoint.
+
  -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 12 Sep 2017 14:33:02 -0700
 
 livecd-rootfs (2.453) artful; urgency=medium
diff --git a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
index 63fd972e..8dfd54b8 100755
--- a/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
+++ b/live-build/ubuntu-server/hooks/032-installer-squashfs.binary
@@ -28,11 +28,11 @@ OVERLAY_ROOT=binary/boot/overlay.dir
 
 mkdir -p "$OVERLAY_ROOT"
 
-setup_mountpoint binary/boot/squashfs.dir
-
 # Create an installer squashfs layer
 mount_overlay "$SQUASH_ROOT/" "$OVERLAY_ROOT/" "$SQUASH_ROOT/"
 
+setup_mountpoint binary/boot/squashfs.dir
+
 # Prepare installer layer.
 
 # Install any requirements for the installer, for things we don't want
@@ -147,17 +147,11 @@ AAHP0AEiHQ7zN0yLl7+fkYIMy64xQJqamH1Z2BFN0GWMPwTjpXpszOC+ev7Bpbg0xoldQ1tBHHxH
 J4Weia71DnXOnt8cj1VhebVMlyv7B/TGAbGwgprgmQ==
 EOF
 
-mv resolv.conf.tmp "binary/boot/squashfs.dir/etc/resolv.conf"
+teardown_mountpoint "$SQUASH_ROOT"
 
-# Unmount the overlay first, where it is mounted:
+# Then unmount the overlay
 umount "$SQUASH_ROOT"
 
-# Then we can start unmounting the "real" root:
-umount "binary/boot/squashfs.dir/proc"
-umount "binary/boot/squashfs.dir/sys"
-umount -R "binary/boot/squashfs.dir/dev"
-umount "binary/boot/squashfs.dir/tmp"
-
 squashfs_f="${PWD}/livecd.${PROJECT}.installer.squashfs"
 
 (cd "$OVERLAY_ROOT/" &&