diff --git a/grub.macros b/grub.macros
index 4162b82..037230d 100644
--- a/grub.macros
+++ b/grub.macros
@@ -226,8 +226,8 @@
 
 %ifarch x86_64
 %global with_efi_common 1
-%global with_legacy_modules 0
-%global with_legacy_common 0
+%global with_legacy_modules 1
+%global with_legacy_common 1
 %else
 %global with_efi_common 0
 %global with_legacy_common 1
diff --git a/grub2.spec b/grub2.spec
index 789399e..6ba76e7 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -17,7 +17,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.06
-Release:	32%{?dist}
+Release:	33%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -58,7 +58,7 @@ BuildRequires:	pesign >= 0.99-8
 BuildRequires:	ccache
 %endif
 
-ExcludeArch:	s390 s390x
+ExcludeArch:	s390 s390x %{ix86}
 Obsoletes:	%{name} <= %{evr}
 
 %if 0%{with_legacy_arch}
@@ -526,6 +526,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
 %endif
 
 %changelog
+* Thu Mar 31 2022 Robbie Harwood <rharwood@redhat.com> - 1:2.06-33
+- Drop i32 build for real this time
+
 * Thu Mar 31 2022 Robbie Harwood <rharwood@redhat.com> - 1:2.06-32
 - Switch to upstream man pages