--- old/make/conf/jib-profiles.js	2018-09-06 15:43:54.678797130 -0700
+++ new/make/conf/jib-profiles.js	2018-09-06 15:43:54.462797138 -0700
@@ -381,7 +381,8 @@
             target_cpu: "x64",
             dependencies: ["devkit", "graphviz", "pandoc", "graalunit_lib"],
             configure_args: concat(common.configure_args_64bit,
-                "--enable-full-docs", "--with-zlib=system"),
+                "--enable-full-docs", "--with-zlib=system",
+                "--with-jvm-variants=server,nonspeculative"),
             default_make_targets: ["docs-bundles"],
         },
 
@@ -422,7 +423,8 @@
             target_os: "windows",
             target_cpu: "x64",
             dependencies: ["devkit", "graalunit_lib"],
-            configure_args: concat(common.configure_args_64bit),
+            configure_args: concat(common.configure_args_64bit,
+                "--with-jvm-variants=server,nonspeculative"),
         },
 
         "windows-x86": {