diff -Nru openjdk-8-8u252-b09/debian/changelog openjdk-8-8u252-b09/debian/changelog
--- openjdk-8-8u252-b09/debian/changelog	2020-04-15 17:26:42.000000000 +0000
+++ openjdk-8-8u252-b09/debian/changelog	2020-04-16 08:47:49.000000000 +0000
@@ -1,8 +1,8 @@
-openjdk-8 (8u252-b09-1build2) focal; urgency=medium
+openjdk-8 (8u252-b09-1ubuntu1) focal; urgency=medium
 
-  * No-change rebuild to pick up i386.
+  * Build without atk-wrapper on i386 in focal.
 
- -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Apr 2020 19:26:42 +0200
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 16 Apr 2020 10:47:49 +0200
 
 openjdk-8 (8u252-b09-1) unstable; urgency=medium
 
diff -Nru openjdk-8-8u252-b09/debian/rules openjdk-8-8u252-b09/debian/rules
--- openjdk-8-8u252-b09/debian/rules	2020-04-14 21:49:29.000000000 +0000
+++ openjdk-8-8u252-b09/debian/rules	2020-04-16 08:47:49.000000000 +0000
@@ -299,6 +299,13 @@
   with_bridge =
 else
   with_bridge = atk
+  ifeq ($(derivative),Ubuntu)
+    ifeq ($(DEB_HOST_ARCH),i386)
+      ifeq (,$(filter $(distrel), precise trusty xenial bionic disco eoan))
+        with_bridge =
+      endif
+    endif
+  endif
 endif
 
 with_nss = yes