diff -Nru partman-crypto-101ubuntu3/debian/changelog partman-crypto-101ubuntu4/debian/changelog
--- partman-crypto-101ubuntu3/debian/changelog	2019-06-21 01:15:21.000000000 +0000
+++ partman-crypto-101ubuntu4/debian/changelog	2019-06-21 11:03:35.000000000 +0000
@@ -1,3 +1,12 @@
+partman-crypto (101ubuntu4) eoan; urgency=medium
+
+  * Drop a big block in finish.d that iterates partman, and then does
+    nothing with the result. As we install cryptsetup whenever any devices
+    are active, irrespective if they were created by partman, or a
+    pre-existing one was activated.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 21 Jun 2019 12:03:35 +0100
+
 partman-crypto (101ubuntu3) eoan; urgency=medium
 
   * Change from installing cryptsetup (meta-package) to
diff -Nru partman-crypto-101ubuntu3/finish.d/crypto_aptinstall partman-crypto-101ubuntu4/finish.d/crypto_aptinstall
--- partman-crypto-101ubuntu3/finish.d/crypto_aptinstall	2019-06-21 01:14:54.000000000 +0000
+++ partman-crypto-101ubuntu4/finish.d/crypto_aptinstall	2019-06-21 10:58:21.000000000 +0000
@@ -5,30 +5,6 @@
 
 . /lib/partman/lib/base.sh
 
-dm_crypt=no
-
-for dev in $DEVICES/*; do
-	[ -d "$dev" ] || continue
-	cd $dev
-	open_dialog PARTITIONS
-	while { read_line num id size type fs path name; [ "$id" ]; }; do
-		[ "$fs" != free ] || continue
-		[ -f $id/method ] || continue
-		[ -f $id/crypto_type ] || continue
-
-		method=$(cat $id/method)
-		[ $method = crypto ] || [ $method = crypto_keep ] || continue
-
-		type=$(cat $id/crypto_type)
-		case $type in
-			dm-crypt)
-				dm_crypt=yes
-				;;
-		esac
-	done
-	close_dialog
-done
-
 if grep -q " device-mapper$" /proc/misc; then
     # We can't check the root node directly because root could be
     # on an LVM LV on top of an encrypted device