diff -Nru resolvconf-1.79ubuntu11/debian/changelog resolvconf-1.79ubuntu12/debian/changelog
--- resolvconf-1.79ubuntu11/debian/changelog	2019-02-28 08:20:48.000000000 -0500
+++ resolvconf-1.79ubuntu12/debian/changelog	2019-03-14 17:17:51.000000000 -0400
@@ -1,3 +1,11 @@
+resolvconf (1.79ubuntu12) disco; urgency=medium
+
+  * Revert last change, so we go back to using stub-resolv.conf again.
+    Instead hack out the 'edns0' option that systemd-resolved has
+    recently added to its stub-resolv.conf.
+
+ -- Dan Streetman <ddstreet@canonical.com>  Thu, 14 Mar 2019 17:17:51 -0400
+
 resolvconf (1.79ubuntu11) disco; urgency=medium
 
   * Pull systemd-resolved conf from non-stub file; the stub file should
diff -Nru resolvconf-1.79ubuntu11/debian/resolvconf.resolvconf-pull-resolved.path resolvconf-1.79ubuntu12/debian/resolvconf.resolvconf-pull-resolved.path
--- resolvconf-1.79ubuntu11/debian/resolvconf.resolvconf-pull-resolved.path	2019-02-28 08:20:48.000000000 -0500
+++ resolvconf-1.79ubuntu12/debian/resolvconf.resolvconf-pull-resolved.path	2019-03-14 17:16:21.000000000 -0400
@@ -1,6 +1,6 @@
 [Path]
-PathChanged=/run/systemd/resolve/resolv.conf
-PathExists=/run/systemd/resolve/resolv.conf
+PathChanged=/run/systemd/resolve/stub-resolv.conf
+PathExists=/run/systemd/resolve/stub-resolv.conf
 
 [Install]
 WantedBy=systemd-resolved.service
diff -Nru resolvconf-1.79ubuntu11/debian/resolvconf.resolvconf-pull-resolved.service resolvconf-1.79ubuntu12/debian/resolvconf.resolvconf-pull-resolved.service
--- resolvconf-1.79ubuntu11/debian/resolvconf.resolvconf-pull-resolved.service	2019-02-28 08:20:48.000000000 -0500
+++ resolvconf-1.79ubuntu12/debian/resolvconf.resolvconf-pull-resolved.service	2019-03-14 17:17:41.000000000 -0400
@@ -4,4 +4,4 @@
 
 [Service]
 Type=oneshot
-ExecStart=+-/bin/sh -c 'cat /run/systemd/resolve/resolv.conf | /sbin/resolvconf -a systemd-resolved'
+ExecStart=+-/bin/sh -c 'cat /run/systemd/resolve/stub-resolv.conf | grep -v edns0 | /sbin/resolvconf -a systemd-resolved'