diff -Nru partman-basicfilesystems-127ubuntu1/check.d/check_swap partman-basicfilesystems-127ubuntu2/check.d/check_swap
--- partman-basicfilesystems-127ubuntu1/check.d/check_swap	2016-11-21 16:42:50.000000000 +0000
+++ partman-basicfilesystems-127ubuntu2/check.d/check_swap	2016-11-30 18:33:10.000000000 +0000
@@ -27,7 +27,7 @@
 done
 
 if ! $swap; then
-	db_input critical partman-basicfilesystems/no_swap || true
+	db_input medium partman-basicfilesystems/no_swap || true
 	db_go || true
 	db_get partman-basicfilesystems/no_swap
 	if [ "$RET" = true ]; then
diff -Nru partman-basicfilesystems-127ubuntu1/debian/changelog partman-basicfilesystems-127ubuntu2/debian/changelog
--- partman-basicfilesystems-127ubuntu1/debian/changelog	2016-11-21 16:44:34.000000000 +0000
+++ partman-basicfilesystems-127ubuntu2/debian/changelog	2016-11-30 18:34:59.000000000 +0000
@@ -1,3 +1,12 @@
+partman-basicfilesystems (127ubuntu2) zesty; urgency=medium
+
+  * Reapply 120ubuntu2 changes:
+  * Set no_swap to false, and lower priority to medium. Having no swap
+    is ok these days, and soon there will be partman-swapfile in use by
+    default providing swapfile support, instead of swap partition.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Wed, 30 Nov 2016 18:34:59 +0000
+
 partman-basicfilesystems (127ubuntu1) zesty; urgency=medium
 
   * Resynchronise with Debian.  Remaining changes:
@@ -69,6 +78,14 @@
 
  -- Christian Perrier <bubulle@debian.org>  Thu, 28 Jan 2016 05:43:35 +0100
 
+partman-basicfilesystems (120ubuntu2) zesty; urgency=medium
+
+  * Check no_swap to false, and lower priority to medium. Having no swap
+    is ok these days, and soon there will be partman-swapfile in use by
+    default providing swapfile support, instead of swap partition.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 18 Nov 2016 16:52:21 +0000
+
 partman-basicfilesystems (120ubuntu1) xenial; urgency=medium
 
   * Resynchronise with Debian.  Remaining changes:
diff -Nru partman-basicfilesystems-127ubuntu1/debian/partman-basicfilesystems.templates partman-basicfilesystems-127ubuntu2/debian/partman-basicfilesystems.templates
--- partman-basicfilesystems-127ubuntu1/debian/partman-basicfilesystems.templates	2016-11-21 16:42:50.000000000 +0000
+++ partman-basicfilesystems-127ubuntu2/debian/partman-basicfilesystems.templates	2016-11-30 18:33:10.000000000 +0000
@@ -45,7 +45,7 @@
 
 Template: partman-basicfilesystems/no_swap
 Type: boolean
-Default: true
+Default: false
 # :sl2:
 _Description: Do you want to return to the partitioning menu?
  You have not selected any partitions for use as swap space. Enabling swap