diff --git a/debian/changelog b/debian/changelog
index 1b4eb573..98a36549 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.653) focal; urgency=medium
+
+  * Stop trying to extract autoinstall config during boot, subiquity will do
+    it instead.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Wed, 11 Mar 2020 09:56:22 +1300
+
 livecd-rootfs (2.652) focal; urgency=medium
 
   * Switch to using the generic pi gadget repo for classic builds. Use the
diff --git a/live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg b/live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg
index ae6ce8a7..33d15fee 100644
--- a/live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg
+++ b/live-build/ubuntu-server/includes.binary/overlay/etc/cloud/cloud.cfg
@@ -117,15 +117,3 @@ system_info:
          primary: http://ports.ubuntu.com/ubuntu-ports
          security: http://ports.ubuntu.com/ubuntu-ports
    ssh_svcname: ssh
-
-runcmd:
- - - "python3"
-   - "-c"
-   - |
-     import subprocess, sys, yaml
-     user_data = yaml.safe_load(subprocess.run([
-         "cloud-init", "query", "userdata"],
-         check=True, stdout=subprocess.PIPE, encoding='utf-8').stdout)
-     if user_data is not None and 'autoinstall' in user_data:
-         with open("/autoinstall.yaml", "w") as fp:
-             yaml.dump(user_data['autoinstall'], fp)
diff --git a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
index 99639b7b..c2b64591 100644
--- a/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
+++ b/live-build/ubuntu-server/includes.binary/overlay/usr/lib/systemd/system/snap.subiquity.subiquity-service.service.d/subiquity.conf
@@ -1,6 +1,6 @@
 [Unit]
 IgnoreOnIsolate=yes
-After=systemd-user-sessions.service plymouth-quit-wait.service cloud-final.service snapd.seeded.service
+After=systemd-user-sessions.service plymouth-quit-wait.service snap.seeded.service
 ConditionPathExists=!/run/subiquity/complete
 
 [Service]