diff --git a/0001-Revert-Support-GNOME-42-dark-theme-preference.patch b/0001-Revert-Support-GNOME-42-dark-theme-preference.patch
new file mode 100644
index 0000000..9f2afef
--- /dev/null
+++ b/0001-Revert-Support-GNOME-42-dark-theme-preference.patch
@@ -0,0 +1,48 @@
+From f292954b5e4ebf8775f48e269b4a840e3043d412 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Mon, 21 Mar 2022 17:19:28 -0700
+Subject: [PATCH] Revert "Support GNOME 42 dark theme preference"
+
+This reverts commit d91dd17bd8169aa8f20a141f33b6c8298a573ee5.
+---
+ gnome-initial-setup/gnome-initial-setup.c | 4 ----
+ gnome-initial-setup/meson.build           | 1 -
+ 2 files changed, 5 deletions(-)
+
+diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
+index 245a1334..a4c67110 100644
+--- a/gnome-initial-setup/gnome-initial-setup.c
++++ b/gnome-initial-setup/gnome-initial-setup.c
+@@ -27,7 +27,6 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <glib/gi18n.h>
+-#include <handy.h>
+ 
+ #ifdef HAVE_CHEESE
+ #include <cheese-gtk.h>
+@@ -290,9 +289,6 @@ main (int argc, char *argv[])
+ #endif
+ 
+   gtk_init (&argc, &argv);
+-  hdy_init ();
+-  hdy_style_manager_set_color_scheme (hdy_style_manager_get_default (),
+-    HDY_COLOR_SCHEME_PREFER_LIGHT);
+ 
+   g_message ("Starting gnome-initial-setup");
+   if (gis_get_mock_mode ())
+diff --git a/gnome-initial-setup/meson.build b/gnome-initial-setup/meson.build
+index 4ee9ff39..43321ec7 100644
+--- a/gnome-initial-setup/meson.build
++++ b/gnome-initial-setup/meson.build
+@@ -44,7 +44,6 @@ dependencies = [
+     dependency ('gdm', version: '>= 3.8.3'),
+     dependency ('geocode-glib-1.0'),
+     dependency ('libgeoclue-2.0', version: '>= 2.3.1'),
+-    dependency ('libhandy-1', version: '>= 1.5.90', fallback: ['libhandy', 'libhandy_dep']),
+     cc.find_library('m', required: false),
+     dependency ('pango', version: '>= 1.32.5'),
+     dependency ('rest-0.7'),
+-- 
+2.35.1
+
diff --git a/gnome-initial-setup.spec b/gnome-initial-setup.spec
index 3fffbbd..3b8c1d9 100644
--- a/gnome-initial-setup.spec
+++ b/gnome-initial-setup.spec
@@ -9,13 +9,17 @@
 
 Name:           gnome-initial-setup
 Version:        42.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bootstrapping your OS
 
 License:        GPLv2+
 URL:            https://wiki.gnome.org/Design/OS/InitialSetup
 Source0:        https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz
 Source1:        vendor.conf
+# Revert dark theme support - it breaks setting new user keyring password:
+# https://bugzilla.redhat.com/show_bug.cgi?id=2066424
+# https://gitlab.gnome.org/GNOME/gnome-initial-setup/-/issues/141
+Patch0:         0001-Revert-Support-GNOME-42-dark-theme-preference.patch
 
 BuildRequires:  meson
 BuildRequires:  gcc
@@ -107,6 +111,9 @@ useradd -rM -d /run/gnome-initial-setup/ -s /sbin/nologin %{name} &>/dev/null ||
 %{_datadir}/gnome-initial-setup/vendor.conf
 
 %changelog
+* Mon Mar 21 2022 Adam Williamson <awilliam@redhat.com> - 42.0-2
+- Revert dark theme support to fix user keyring password (#2066424)
+
 * Fri Mar 18 2022 David King <amigadave@amigadave.com> - 42.0-1
 - Update to 42.0