diff --git a/grub2.changes b/grub2.changes
index 6e3fd13..96c8b3a 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Fri Dec  9 03:54:19 UTC 2022 - Gary Ching-Pang Lin <glin@suse.com>
-
-- Move unsupported zfs modules into 'extras' packages (bsc#1205554)
-
 -------------------------------------------------------------------
 Mon Dec  5 08:47:06 UTC 2022 - Michael Chang <mchang@suse.com>
 
diff --git a/grub2.spec b/grub2.spec
index 7be708b..49ace87 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -551,16 +551,6 @@ bootloader with modular architecture.  It supports rich variety of kernel format
 file systems, computer architectures and hardware devices.  This subpackage
 provides support for %{platform} systems.
 
-%package %{grubarch}-extras
-Summary:        Unsupported modules for %{grubarch}
-Group:          System/Boot
-BuildArch:      noarch
-Requires:       %{name}-%{grubarch} = %{version}
-Supplements:    %{name}-%{grubarch} = %{version}
-
-%description %{grubarch}-extras
-Unsupported modules for %{name}-%{grubarch}
-
 %package %{grubarch}-debug
 Summary:        Debug symbols for %{grubarch}
 Group:          System/Boot
@@ -605,17 +595,6 @@ bootloader with modular architecture.  It supports rich variety of kernel format
 file systems, computer architectures and hardware devices.  This subpackage
 provides support for EFI systems.
 
-%package %{grubefiarch}-extras
-
-Summary:        Unsupported modules for %{grubefiarch}
-Group:          System/Boot
-BuildArch:      noarch
-Requires:       %{name}-%{grubefiarch} = %{version}
-Supplements:    %{name}-%{grubefiarch} = %{version}
-
-%description %{grubefiarch}-extras
-Unsupported modules for %{name}-%{grubefiarch}
-
 %package %{grubefiarch}-debug
 Summary:        Debug symbols for %{grubefiarch}
 Group:          System/Boot
@@ -648,16 +627,6 @@ bootloader with modular architecture.  It supports rich variety of kernel format
 file systems, computer architectures and hardware devices.  This subpackage
 provides support for XEN systems.
 
-%package %{grubxenarch}-extras
-Summary:        Unsupported modules for %{grubxenarch}
-Group:          System/Boot
-BuildArch:      noarch
-Requires:       %{name}-%{grubxenarch} = %{version}
-Supplements:    %{name}-%{grubxenarch} = %{version}
-
-%description %{grubxenarch}-extras
-Unsupported modules for %{name}-%{grubxenarch}
-
 %endif
 
 %package snapper-plugin
@@ -1134,25 +1103,6 @@ perl -ni -e '
 %else
 %endif
 
-# bsc#1205554 move the zfs modules into extras packages
-# EXTRA_PATTERN='pattern1|pattern2|pattern3|...'
-EXTRA_PATTERN="zfs"
-%ifarch %{ix86} x86_64
-find %{buildroot}/%{_datadir}/%{name}/%{grubxenarch}/ -type f | sed 's,%{buildroot},,' > %{grubxenarch}-all.lst
-grep -v -E ${EXTRA_PATTERN} %{grubxenarch}-all.lst > %{grubxenarch}.lst
-grep -E ${EXTRA_PATTERN} %{grubxenarch}-all.lst > %{grubxenarch}-extras.lst
-%endif
-
-%ifarch %{efi}
-find %{buildroot}/%{_datadir}/%{name}/%{grubefiarch}/ -name '*.mod' | sed 's,%{buildroot},,' > %{grubefiarch}-mod-all.lst
-grep -v -E ${EXTRA_PATTERN} %{grubefiarch}-mod-all.lst > %{grubefiarch}-mod.lst
-grep -E ${EXTRA_PATTERN} %{grubefiarch}-mod-all.lst > %{grubefiarch}-mod-extras.lst
-%endif
-
-find %{buildroot}/%{_datadir}/%{name}/%{grubarch}/ -name '*.mod' | sed 's,%{buildroot},,' > %{grubarch}-mod-all.lst
-grep -v -E ${EXTRA_PATTERN} %{grubarch}-mod-all.lst > %{grubarch}-mod.lst
-grep -E ${EXTRA_PATTERN} %{grubarch}-mod-all.lst > %{grubarch}-mod-extras.lst
-
 %find_lang %{name}
 %fdupes %buildroot%{_bindir}
 %fdupes %buildroot%{_libdir}
@@ -1424,7 +1374,7 @@ fi
 
 %if ! 0%{?only_efi:1}
 
-%files %{grubarch} -f %{grubarch}-mod.lst
+%files %{grubarch}
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/%{grubarch}
 %ifarch ppc ppc64 ppc64le
@@ -1439,6 +1389,7 @@ fi
 %endif
 %{_datadir}/%{name}/%{grubarch}/*.img
 %{_datadir}/%{name}/%{grubarch}/*.lst
+%{_datadir}/%{name}/%{grubarch}/*.mod
 %ifarch x86_64
 %{_datadir}/%{name}/%{grubarch}/efiemu*.o
 %endif
@@ -1448,10 +1399,6 @@ fi
 %{_libexecdir}/%{name}-instdev-fixup.pl
 %endif
 
-%files %{grubarch}-extras -f %{grubarch}-mod-extras.lst
-%defattr(-,root,root,-)
-%dir %{_datadir}/%{name}/%{grubarch}
-
 %files %{grubarch}-debug
 %defattr(-,root,root,-)
 %{_datadir}/%{name}/%{grubarch}/gdb_grub
@@ -1462,7 +1409,7 @@ fi
 
 %ifarch %{efi}
 
-%files %{grubefiarch} -f %{grubefiarch}-mod.lst
+%files %{grubefiarch}
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/%{grubefiarch}
 %{_datadir}/%{name}/%{grubefiarch}/grub.efi
@@ -1471,6 +1418,7 @@ fi
 %endif
 %{_datadir}/%{name}/%{grubefiarch}/*.img
 %{_datadir}/%{name}/%{grubefiarch}/*.lst
+%{_datadir}/%{name}/%{grubefiarch}/*.mod
 %{_datadir}/%{name}/%{grubefiarch}/kernel.exec
 %{_datadir}/%{name}/%{grubefiarch}/modinfo.sh
 %dir %{sysefibasedir}
@@ -1489,10 +1437,6 @@ fi
 %{sysefidir}/grub.der
 %endif
 
-%files %{grubefiarch}-extras -f %{grubefiarch}-mod-extras.lst
-%defattr(-,root,root,-)
-%dir %{_datadir}/%{name}/%{grubefiarch}
-
 %files %{grubefiarch}-debug
 %defattr(-,root,root,-)
 %{_datadir}/%{name}/%{grubefiarch}/gdb_grub
@@ -1509,16 +1453,13 @@ fi
 %{_libdir}/snapper/plugins/grub
 
 %ifarch %{ix86} x86_64
-%files %{grubxenarch} -f %{grubxenarch}.lst
+%files %{grubxenarch}
 %defattr(-,root,root,-)
 %dir %{_datadir}/%{name}/%{grubxenarch}
+%{_datadir}/%{name}/%{grubxenarch}/*
 # provide compatibility sym-link for VM definitions pointing to old location
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/%{grubxenarch}
-
-%files %{grubxenarch}-extras -f %{grubxenarch}-extras.lst
-%defattr(-,root,root,-)
-%dir %{_datadir}/%{name}/%{grubxenarch}
 %endif
 
 %if 0%{?has_systemd:1}