diff -Nru partman-efi-71ubuntu4/check.d/efi partman-efi-71ubuntu5/check.d/efi
--- partman-efi-71ubuntu4/check.d/efi	2018-07-03 16:17:34.000000000 +0000
+++ partman-efi-71ubuntu5/check.d/efi	2019-02-01 15:36:38.000000000 +0000
@@ -33,11 +33,7 @@
 	done
 done
 
-# On Intel Macs, it isn't entirely clear that you have to have an EFI system
-# partition; see http://refit.sourceforge.net/myths/ for further details. In
-# the meantime, we only force an EFI system partition on ia64.
 if [ -e /var/lib/partman/efi ] && \
-   [ "$(udpkg --print-architecture)" = ia64 ] && \
    [ "$have_efi" = no ]; then
 	db_input critical partman-efi/no_efi || true
 	db_go || exit 1
diff -Nru partman-efi-71ubuntu4/debian/changelog partman-efi-71ubuntu5/debian/changelog
--- partman-efi-71ubuntu4/debian/changelog	2018-07-03 16:18:17.000000000 +0000
+++ partman-efi-71ubuntu5/debian/changelog	2019-02-08 22:04:09.000000000 +0000
@@ -1,3 +1,13 @@
+partman-efi (71ubuntu5) disco; urgency=medium
+
+  * check.d/efi: Make sure we block on a missing EFI partition no matter what
+    architecture, not just for ia64. One could attempt to install on EFI x86
+    and will need an ESP to be able to install GRUB. (LP: #1803031)
+  * debian/partman-efi.templates: Make the no_efi template clearer, so that it
+    clearly explains why an EFI System partition is important.
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Fri, 08 Feb 2019 17:04:09 -0500
+
 partman-efi (71ubuntu4) cosmic; urgency=medium
 
   * Clean-up leftover checks for the no longer used ignore_uefi file.
diff -Nru partman-efi-71ubuntu4/debian/partman-efi.templates partman-efi-71ubuntu5/debian/partman-efi.templates
--- partman-efi-71ubuntu4/debian/partman-efi.templates	2018-03-28 16:16:17.000000000 +0000
+++ partman-efi-71ubuntu5/debian/partman-efi.templates	2019-02-01 15:36:38.000000000 +0000
@@ -12,7 +12,10 @@
 Type: boolean
 # :sl5:
 _Description: Go back to the menu and resume partitioning?
- No EFI partition was found.
+ No EFI System Partition was found. This system will likely not be able to
+ boot successfully, and the installation process may fail.
+ .
+ Please go back and add an EFI System Partition, or continue at your own risk.
 
 Template: partman/method_long/efi
 Type: text