diff -Nru ubuntu-advantage-tools-27.1~21.10.1/apt-hook/20apt-esm-hook.conf ubuntu-advantage-tools-27.1~21.10.1.1/apt-hook/20apt-esm-hook.conf
--- ubuntu-advantage-tools-27.1~21.10.1/apt-hook/20apt-esm-hook.conf	2021-05-24 18:50:47.000000000 +0000
+++ ubuntu-advantage-tools-27.1~21.10.1.1/apt-hook/20apt-esm-hook.conf	2021-06-16 16:14:04.000000000 +0000
@@ -8,8 +8,8 @@
 
 APT::Install::Pre-Invoke {
 	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-hook ] || /usr/lib/ubuntu-advantage/apt-esm-hook pre-invoke || true";
-}
+};
 
 AptCli::Hooks::Upgrade {
 	"[ ! -f /usr/lib/ubuntu-advantage/apt-esm-json-hook ] || /usr/lib/ubuntu-advantage/apt-esm-json-hook || true";
-}
+};
diff -Nru ubuntu-advantage-tools-27.1~21.10.1/debian/changelog ubuntu-advantage-tools-27.1~21.10.1.1/debian/changelog
--- ubuntu-advantage-tools-27.1~21.10.1/debian/changelog	2021-05-24 18:50:47.000000000 +0000
+++ ubuntu-advantage-tools-27.1~21.10.1.1/debian/changelog	2021-06-16 16:14:08.000000000 +0000
@@ -1,3 +1,9 @@
+ubuntu-advantage-tools (27.1~21.10.1.1) impish; urgency=medium
+
+  * Cherrypick upstream pr #1681 to unbreak many migrations. LP: #1930741
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 16 Jun 2021 17:14:08 +0100
+
 ubuntu-advantage-tools (27.1~21.10.1) impish; urgency=medium
 
   * d/control: