diff -Nru gtk+3.0-3.22.11/debian/changelog gtk+3.0-3.22.11/debian/changelog
--- gtk+3.0-3.22.11/debian/changelog	2017-03-20 16:25:54.000000000 +0000
+++ gtk+3.0-3.22.11/debian/changelog	2017-03-24 01:32:35.000000000 +0000
@@ -1,3 +1,9 @@
+gtk+3.0 (3.22.11-0ubuntu2) zesty; urgency=medium
+
+  * Drop hack to disable Mir backend on s390x
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 23 Mar 2017 21:32:35 -0400
+
 gtk+3.0 (3.22.11-0ubuntu1) zesty; urgency=medium
 
   [ Jeremy Bicha ]
diff -Nru gtk+3.0-3.22.11/debian/control gtk+3.0-3.22.11/debian/control
--- gtk+3.0-3.22.11/debian/control	2017-03-20 16:25:54.000000000 +0000
+++ gtk+3.0-3.22.11/debian/control	2017-03-24 01:32:35.000000000 +0000
@@ -51,9 +51,9 @@
                xauth <!nocheck>,
                xsltproc,
                xvfb <!nocheck>,
-               libmirclient-dev (>= 0.13.3) [!s390x],
-               libmircookie-dev (>= 0.17.0) [!s390x],
-               libcontent-hub-glib-dev [!s390x],
+               libmirclient-dev (>= 0.13.3),
+               libmircookie-dev (>= 0.17.0),
+               libcontent-hub-glib-dev,
 Build-Depends-Indep: libglib2.0-doc,
                      libatk1.0-doc,
                      libpango1.0-doc,
@@ -151,9 +151,9 @@
          ${shlibs:Depends},
          libglib2.0-dev (>= 2.49.4),
          libgdk-pixbuf2.0-dev (>= 2.30.0),
-         libmirclient-dev (>= 0.13.3) [!s390x],
-         libmircookie-dev (>= 0.17.0) [!s390x],
-         libcontent-hub-glib-dev [!s390x],
+         libmirclient-dev (>= 0.13.3),
+         libmircookie-dev (>= 0.17.0),
+         libcontent-hub-glib-dev,
          libpango1.0-dev (>= 1.37.3),
          libatk1.0-dev (>= 2.15.1),
          libatk-bridge2.0-dev,
diff -Nru gtk+3.0-3.22.11/debian/control.in gtk+3.0-3.22.11/debian/control.in
--- gtk+3.0-3.22.11/debian/control.in	2017-03-20 16:25:54.000000000 +0000
+++ gtk+3.0-3.22.11/debian/control.in	2017-03-24 01:32:35.000000000 +0000
@@ -51,9 +51,9 @@
                xauth <!nocheck>,
                xsltproc,
                xvfb <!nocheck>,
-               libmirclient-dev (>= 0.13.3) [!s390x],
-               libmircookie-dev (>= 0.17.0) [!s390x],
-               libcontent-hub-glib-dev [!s390x],
+               libmirclient-dev (>= 0.13.3),
+               libmircookie-dev (>= 0.17.0),
+               libcontent-hub-glib-dev,
 Build-Depends-Indep: libglib2.0-doc,
                      libatk1.0-doc,
                      libpango1.0-doc,
@@ -151,9 +151,9 @@
          ${shlibs:Depends},
          libglib2.0-dev (>= 2.49.4),
          libgdk-pixbuf2.0-dev (>= 2.30.0),
-         libmirclient-dev (>= 0.13.3) [!s390x],
-         libmircookie-dev (>= 0.17.0) [!s390x],
-         libcontent-hub-glib-dev [!s390x],
+         libmirclient-dev (>= 0.13.3),
+         libmircookie-dev (>= 0.17.0),
+         libcontent-hub-glib-dev,
          libpango1.0-dev (>= 1.37.3),
          libatk1.0-dev (>= 2.15.1),
          libatk-bridge2.0-dev,
diff -Nru gtk+3.0-3.22.11/debian/libgtk-3-0.symbols gtk+3.0-3.22.11/debian/libgtk-3-0.symbols
--- gtk+3.0-3.22.11/debian/libgtk-3-0.symbols	2017-03-20 16:25:54.000000000 +0000
+++ gtk+3.0-3.22.11/debian/libgtk-3-0.symbols	2017-03-24 01:32:35.000000000 +0000
@@ -328,11 +328,11 @@
  gdk_keyval_to_unicode@Base 3.0.0
  gdk_keyval_to_upper@Base 3.0.0
  gdk_list_visuals@Base 3.0.0
- (arch=!s390x)gdk_mir_display_get_mir_connection@Base 3.12.2-0ubuntu5
- (arch=!s390x)gdk_mir_display_get_type@Base 3.12.2-0ubuntu5
- (arch=!s390x)gdk_mir_gl_context_get_type@Base 3.16.2
- (arch=!s390x)gdk_mir_window_get_mir_surface@Base 3.16.2
- (arch=!s390x)gdk_mir_window_get_type@Base 3.12.2-0ubuntu5
+ gdk_mir_display_get_mir_connection@Base 3.12.2-0ubuntu5
+ gdk_mir_display_get_type@Base 3.12.2-0ubuntu5
+ gdk_mir_gl_context_get_type@Base 3.16.2
+ gdk_mir_window_get_mir_surface@Base 3.16.2
+ gdk_mir_window_get_type@Base 3.12.2-0ubuntu5
  gdk_modifier_intent_get_type@Base 3.3.16
  gdk_modifier_type_get_type@Base 3.0.0
  gdk_monitor_get_display@Base 3.21.4
diff -Nru gtk+3.0-3.22.11/debian/rules gtk+3.0-3.22.11/debian/rules
--- gtk+3.0-3.22.11/debian/rules	2017-03-20 16:25:54.000000000 +0000
+++ gtk+3.0-3.22.11/debian/rules	2017-03-24 01:32:35.000000000 +0000
@@ -73,6 +73,7 @@
 
 DEB_CONFIGURE_FLAGS_shared = \
 			--enable-broadway-backend \
+			--enable-mir-backend \
 			--enable-x11-backend \
 			--enable-gtk-doc \
 			--enable-man \
@@ -87,12 +88,6 @@
 DEB_CONFIGURE_FLAGS_shared += --disable-colord
 endif
 
-ifeq (s390x,$(DEB_HOST_ARCH))
-DEB_CONFIGURE_FLAGS_shared += --disable-mir-backend
-else
-DEB_CONFIGURE_FLAGS_shared += --enable-mir-backend
-endif
-
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 DEB_CONFIGURE_FLAGS_shared += --enable-wayland-backend
 else