diff -Nru openvswitch-2.6.1/debian/changelog openvswitch-2.6.1/debian/changelog
--- openvswitch-2.6.1/debian/changelog	2017-08-24 18:09:53.000000000 +0000
+++ openvswitch-2.6.1/debian/changelog	2017-10-17 16:32:44.000000000 +0000
@@ -1,3 +1,11 @@
+openvswitch (2.6.1-0ubuntu5.17.04.1) zesty; urgency=medium
+
+  [ Frode Nordahl ]
+  * d/openvswitch-switch.postinst: Do not modify pre-existing
+        /etc/default/openvswitch-switch (LP: #1723480)
+
+ -- Frode Nordahl <frode.nordahl@gmail.com>  Tue, 17 Oct 2017 16:32:44 +0000
+
 openvswitch (2.6.1-0ubuntu5.1) zesty-security; urgency=medium
 
   * SECURITY UPDATE: DoS while parsing OFPT_QUEUE_GET_CONFIG_REPLY message
diff -Nru openvswitch-2.6.1/debian/openvswitch-switch.postinst openvswitch-2.6.1/debian/openvswitch-switch.postinst
--- openvswitch-2.6.1/debian/openvswitch-switch.postinst	2016-11-15 13:27:38.000000000 +0000
+++ openvswitch-2.6.1/debian/openvswitch-switch.postinst	2017-10-17 16:32:42.000000000 +0000
@@ -27,14 +27,6 @@
 	TEMPLATE=/usr/share/openvswitch/switch/default.template
 	if ! test -e $DEFAULT; then
 	    cp $TEMPLATE $DEFAULT
-	else
-            for var in $(awk -F'[ :]' '/^# [_A-Z0-9]+:/{print $2}' $TEMPLATE)
-            do
-                if ! grep $var $DEFAULT >/dev/null 2>&1; then
-	            echo >> $DEFAULT
-	            sed -n "/$var:/,/$var=/p" $TEMPLATE >> $DEFAULT
-                fi
-            done
 	fi
 
 	# Ensure that /etc/openvswitch/conf.db links to /var/lib/openvswitch,