--- old/src/hotspot/cpu/x86/x86_64.ad	2019-02-20 11:55:34.942293868 +0100
+++ new/src/hotspot/cpu/x86/x86_64.ad	2019-02-20 11:55:34.746287587 +0100
@@ -354,7 +354,7 @@
 RegMask _STACK_OR_INT_REG_mask;
 
 static bool need_r12_heapbase() {
-  return UseCompressedOops || UseCompressedClassPointers || UseZGC;
+  return UseCompressedOops || UseCompressedClassPointers;
 }
 
 void reg_mask_init() {