diff --git a/java-1_8_0-openjdk.spec b/java-1_8_0-openjdk.spec
index cdc7608..089dffc 100644
--- a/java-1_8_0-openjdk.spec
+++ b/java-1_8_0-openjdk.spec
@@ -49,12 +49,6 @@
 %global cacerts  %{_jvmdir}/%{jredir}/lib/security/cacerts
 # real file made by update-ca-certificates
 %global javacacerts %{_var}/lib/ca-certificates/java-cacerts
-# turn zero on non jit arches by default
-%ifarch s390
-%global _with_bootstrap 0
-%else
-%bcond_without bootstrap
-%endif
 %ifnarch %{jit_arches}
 %global _with_zero 1
 %endif
@@ -143,6 +137,8 @@
 %else
 %global with_sunec 0
 %endif
+# turn zero on non jit arches by default
+%bcond_without bootstrap
 %bcond_with zero
 # Turn on/off some features depending on openSUSE version
 %if 0%{?suse_version} >= 1130