diff -Nru network-manager-1.0.4/debian/changelog network-manager-1.0.4/debian/changelog
--- network-manager-1.0.4/debian/changelog	2015-11-24 16:13:51.000000000 -0500
+++ network-manager-1.0.4/debian/changelog	2016-01-20 15:11:21.000000000 -0500
@@ -1,3 +1,10 @@
+network-manager (1.0.4-0ubuntu8) xenial; urgency=medium
+
+  * Fix NetworkManager-wait-online.service so it is enabled so NFS
+    and other remote FS work with name resolution. (LP: #1515446)
+
+ -- Bryan Quigley <bryan.quigley@canonical.com>  Wed, 20 Jan 2016 15:10:50 -0500
+
 network-manager (1.0.4-0ubuntu7) xenial; urgency=medium
 
   * debian/patches/lp1499827_device_avoid_undefined_mtu_c44069c1.patch
diff -Nru network-manager-1.0.4/debian/network-manager.postinst network-manager-1.0.4/debian/network-manager.postinst
--- network-manager-1.0.4/debian/network-manager.postinst	2015-11-24 16:13:51.000000000 -0500
+++ network-manager-1.0.4/debian/network-manager.postinst	2016-01-20 15:11:49.000000000 -0500
@@ -44,11 +44,6 @@
                 echo "" 1>&2
             fi
         fi
-
-        # enable NM-wait-online on upgrades
-        if dpkg --compare-versions "$2" lt-nl "0.9.10.0-4ubuntu10"; then
-            deb-systemd-helper purge NetworkManager-wait-online.service
-        fi
         ;;
 
     abort-upgrade|abort-deconfigure|abort-remove)
diff -Nru network-manager-1.0.4/debian/rules network-manager-1.0.4/debian/rules
--- network-manager-1.0.4/debian/rules	2015-11-24 16:13:51.000000000 -0500
+++ network-manager-1.0.4/debian/rules	2016-01-20 15:07:33.000000000 -0500
@@ -63,11 +63,6 @@
 override_dh_strip:
 	dh_strip --dbg-package=network-manager-dbg
 
-override_dh_systemd_enable:
-	dh_systemd_enable -pnetwork-manager NetworkManager-dispatcher.service
-	dh_systemd_enable -pnetwork-manager --no-enable NetworkManager-wait-online.service
-	dh_systemd_enable -pnetwork-manager NetworkManager.service
-
 override_dh_systemd_start:
 	dh_link lib/systemd/system/NetworkManager.service \
 		lib/systemd/system/network-manager.service