diff --git a/panels/common/cc-language-chooser.c b/panels/common/cc-language-chooser.c
index 0991cdc06..919cb1c6b 100644
--- a/panels/common/cc-language-chooser.c
+++ b/panels/common/cc-language-chooser.c
@@ -37,7 +37,7 @@
 #include <libgnome-desktop/gnome-languages.h>
 
 struct _CcLanguageChooser {
-        HdyDialog parent_instance;
+        GtkDialog parent_instance;
 
         GtkWidget *select_button;
         GtkWidget *no_results;
@@ -50,7 +50,7 @@ struct _CcLanguageChooser {
         gchar **filter_words;
 };
 
-G_DEFINE_TYPE (CcLanguageChooser, cc_language_chooser, HDY_TYPE_DIALOG)
+G_DEFINE_TYPE (CcLanguageChooser, cc_language_chooser, GTK_TYPE_DIALOG)
 
 static GtkWidget *
 language_widget_new (const gchar *locale_id,
diff --git a/panels/common/cc-language-chooser.h b/panels/common/cc-language-chooser.h
index 4c5402b57..8e050ee40 100644
--- a/panels/common/cc-language-chooser.h
+++ b/panels/common/cc-language-chooser.h
@@ -23,13 +23,10 @@
 #include <gtk/gtk.h>
 #include <glib-object.h>
 
-#define HANDY_USE_UNSTABLE_API
-#include <handy.h>
-
 G_BEGIN_DECLS
 
 #define CC_TYPE_LANGUAGE_CHOOSER (cc_language_chooser_get_type ())
-G_DECLARE_FINAL_TYPE (CcLanguageChooser, cc_language_chooser, CC, LANGUAGE_CHOOSER, HdyDialog)
+G_DECLARE_FINAL_TYPE (CcLanguageChooser, cc_language_chooser, CC, LANGUAGE_CHOOSER, GtkDialog)
 
 CcLanguageChooser *cc_language_chooser_new          (void);
 void               cc_language_chooser_clear_filter (CcLanguageChooser *chooser);
diff --git a/panels/common/cc-language-chooser.ui b/panels/common/cc-language-chooser.ui
index fbf038b53..6b61d5520 100644
--- a/panels/common/cc-language-chooser.ui
+++ b/panels/common/cc-language-chooser.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <template class="CcLanguageChooser" parent="HdyDialog">
+  <template class="CcLanguageChooser" parent="GtkDialog">
     <property name="title" translatable="yes">Select Language</property>
     <property name="modal">True</property>
     <property name="destroy_with_parent">True</property>
diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui
index de377bb69..12dd7a702 100644
--- a/panels/info-overview/cc-info-overview-panel.ui
+++ b/panels/info-overview/cc-info-overview-panel.ui
@@ -184,7 +184,7 @@
     </child>
   </template>
 
-  <object class="HdyDialog" id="hostname_editor">
+  <object class="GtkDialog" id="hostname_editor">
     <property name="visible">False</property>
     <property name="modal">True</property>
     <property name="use-header-bar">1</property>
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index 860c15caa..ea1874fa2 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -21,9 +21,6 @@
 
 #include "config.h"
 
-#define HANDY_USE_UNSTABLE_API
-#include <handy.h>
-
 #include <glib-object.h>
 #include <glib/gi18n.h>
 
@@ -1059,7 +1056,7 @@ history_button_clicked_cb (NetDeviceWifi *self)
         GtkWidget *list;
         GList *list_rows;
 
-        dialog = g_object_new (HDY_TYPE_DIALOG, "use-header-bar", 1, NULL);
+        dialog = g_object_new (GTK_TYPE_DIALOG, "use-header-bar", 1, NULL);
         window = gtk_widget_get_toplevel (GTK_WIDGET (self));
         gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (window));
         gtk_window_set_title (GTK_WINDOW (dialog), _("Known Wi-Fi Networks"));
diff --git a/panels/notifications/cc-app-notifications-dialog.c b/panels/notifications/cc-app-notifications-dialog.c
index c7850f321..4d8ffddb9 100644
--- a/panels/notifications/cc-app-notifications-dialog.c
+++ b/panels/notifications/cc-app-notifications-dialog.c
@@ -49,7 +49,7 @@ static void update_sound_switch (CcAppNotificationsDialog *dialog);
 static void update_notification_switch (CcAppNotificationsDialog *dialog);
 
 struct _CcAppNotificationsDialog {
-  HdyDialog            parent;
+  GtkDialog            parent;
 
   GSettings           *settings;
   GSettings           *master_settings;
@@ -65,7 +65,7 @@ struct _CcAppNotificationsDialog {
   GtkWidget           *lock_screen_content_switch;
 };
 
-G_DEFINE_TYPE (CcAppNotificationsDialog, cc_app_notifications_dialog, HDY_TYPE_DIALOG)
+G_DEFINE_TYPE (CcAppNotificationsDialog, cc_app_notifications_dialog, GTK_TYPE_DIALOG)
 
 static void
 on_perm_store_set_done (GObject *source_object,
diff --git a/panels/notifications/cc-app-notifications-dialog.h b/panels/notifications/cc-app-notifications-dialog.h
index 3cb1a3b5a..99b1e3800 100644
--- a/panels/notifications/cc-app-notifications-dialog.h
+++ b/panels/notifications/cc-app-notifications-dialog.h
@@ -20,14 +20,11 @@
 #pragma once
 
 #include <gtk/gtk.h>
-#define HANDY_USE_UNSTABLE_API
-#include <handy.h>
-#undef HANDY_USE_UNSTABLE_API
 
 G_BEGIN_DECLS
 
 #define CC_TYPE_APP_NOTIFICATIONS_DIALOG (cc_app_notifications_dialog_get_type ())
-G_DECLARE_FINAL_TYPE (CcAppNotificationsDialog, cc_app_notifications_dialog, CC, APP_NOTIFICATIONS_DIALOG, HdyDialog)
+G_DECLARE_FINAL_TYPE (CcAppNotificationsDialog, cc_app_notifications_dialog, CC, APP_NOTIFICATIONS_DIALOG, GtkDialog)
 
 CcAppNotificationsDialog *cc_app_notifications_dialog_new (const gchar          *app_id,
                                                            const gchar          *title,
diff --git a/panels/notifications/cc-app-notifications-dialog.ui b/panels/notifications/cc-app-notifications-dialog.ui
index b3c8f49dc..1bb2909c4 100644
--- a/panels/notifications/cc-app-notifications-dialog.ui
+++ b/panels/notifications/cc-app-notifications-dialog.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="CcAppNotificationsDialog" parent="HdyDialog">
+  <template class="CcAppNotificationsDialog" parent="GtkDialog">
     <property name="width_request">360</property>
     <property name="can_focus">False</property>
     <property name="modal">True</property>
diff --git a/panels/region/cc-format-chooser.c b/panels/region/cc-format-chooser.c
index 0cc97edc3..0aecceffc 100644
--- a/panels/region/cc-format-chooser.c
+++ b/panels/region/cc-format-chooser.c
@@ -35,8 +35,11 @@
 #define GNOME_DESKTOP_USE_UNSTABLE_API
 #include <libgnome-desktop/gnome-languages.h>
 
+#define HANDY_USE_UNSTABLE_API
+#include <handy.h>
+
 struct _CcFormatChooser {
-        HdyDialog parent_instance;
+        GtkDialog parent_instance;
 
         GtkWidget *title_bar;
         GtkWidget *title_buttons;
@@ -66,7 +69,7 @@ struct _CcFormatChooser {
         gchar **filter_words;
 };
 
-G_DEFINE_TYPE (CcFormatChooser, cc_format_chooser, HDY_TYPE_DIALOG)
+G_DEFINE_TYPE (CcFormatChooser, cc_format_chooser, GTK_TYPE_DIALOG)
 
 static void
 display_date (GtkWidget *label, GDateTime *dt, const gchar *format)
diff --git a/panels/region/cc-format-chooser.h b/panels/region/cc-format-chooser.h
index cea8caed0..0248338b3 100644
--- a/panels/region/cc-format-chooser.h
+++ b/panels/region/cc-format-chooser.h
@@ -21,13 +21,11 @@
 #pragma once
 
 #include <gtk/gtk.h>
-#define HANDY_USE_UNSTABLE_API
-#include <handy.h>
 
 G_BEGIN_DECLS
 
 #define CC_TYPE_FORMAT_CHOOSER (cc_format_chooser_get_type ())
-G_DECLARE_FINAL_TYPE (CcFormatChooser, cc_format_chooser, CC, FORMAT_CHOOSER, HdyDialog)
+G_DECLARE_FINAL_TYPE (CcFormatChooser, cc_format_chooser, CC, FORMAT_CHOOSER, GtkDialog)
 
 CcFormatChooser *cc_format_chooser_new          (void);
 void             cc_format_chooser_clear_filter (CcFormatChooser *chooser);
diff --git a/panels/region/cc-format-chooser.ui b/panels/region/cc-format-chooser.ui
index e05ce47c4..0222980aa 100644
--- a/panels/region/cc-format-chooser.ui
+++ b/panels/region/cc-format-chooser.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <template class="CcFormatChooser" parent="HdyDialog">
+  <template class="CcFormatChooser" parent="GtkDialog">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Formats</property>
     <property name="type_hint">dialog</property>
diff --git a/panels/search/cc-search-locations-dialog.c b/panels/search/cc-search-locations-dialog.c
index 043422bc0..48749da5a 100644
--- a/panels/search/cc-search-locations-dialog.c
+++ b/panels/search/cc-search-locations-dialog.c
@@ -43,7 +43,7 @@ typedef struct {
 } Place;
 
 struct _CcSearchLocationsDialog {
-  HdyDialog parent;
+  GtkDialog parent;
 
   GSettings *tracker_preferences;
 
@@ -57,7 +57,7 @@ struct _CcSearchLocationsDialogClass {
   GtkDialogClass parent_class;
 };
 
-G_DEFINE_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, HDY_TYPE_DIALOG)
+G_DEFINE_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, GTK_TYPE_DIALOG)
 
 static void
 cc_search_locations_dialog_finalize (GObject *object)
diff --git a/panels/search/cc-search-locations-dialog.h b/panels/search/cc-search-locations-dialog.h
index 0110dff8c..912f2f082 100644
--- a/panels/search/cc-search-locations-dialog.h
+++ b/panels/search/cc-search-locations-dialog.h
@@ -20,14 +20,10 @@
 
 #pragma once
 
-#define HANDY_USE_UNSTABLE_API
-#include <handy.h>
-#undef HANDY_USE_UNSTABLE_API
-
 #include "cc-search-panel.h"
 
 #define CC_SEARCH_LOCATIONS_DIALOG_TYPE (cc_search_locations_dialog_get_type ())
-G_DECLARE_FINAL_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, CC, SEARCH_LOCATIONS_DIALOG, HdyDialog)
+G_DECLARE_FINAL_TYPE (CcSearchLocationsDialog, cc_search_locations_dialog, CC, SEARCH_LOCATIONS_DIALOG, GtkDialog)
 
 CcSearchLocationsDialog *cc_search_locations_dialog_new (CcSearchPanel *panel);
 
diff --git a/panels/search/cc-search-locations-dialog.ui b/panels/search/cc-search-locations-dialog.ui
index dde94ae45..147829e36 100644
--- a/panels/search/cc-search-locations-dialog.ui
+++ b/panels/search/cc-search-locations-dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <template class="CcSearchLocationsDialog" parent="HdyDialog">
+  <template class="CcSearchLocationsDialog" parent="GtkDialog">
     <property name="can_focus">False</property>
     <property name="default_height">400</property>
     <property name="default_width">360</property>