--- a/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/PointerUtils.java	Fri Jul 07 10:37:52 2017 +0200
+++ b/hotspot/src/jdk.internal.vm.compiler/share/classes/org.graalvm.word/src/org/graalvm/word/PointerUtils.java	Fri Jul 07 09:40:47 2017 -0700
@@ -38,9 +38,9 @@
      *
      * @return A null Pointer value.
      */
-    @SuppressWarnings("unchecked")
     public static <T extends PointerBase> T nullPointer() {
-        return (T) WordFactory.zero();
+        /* This method will be deleted soon. */
+        return WordFactory.nullPointer();
     }
 
     /**
@@ -49,7 +49,8 @@
      * @return Whether that Pointer is the null Pointer.
      */
     public static boolean isNull(ComparableWord that) {
-        return that.equal(nullPointer());
+        /* This method will be deleted soon. */
+        return ((PointerBase) that).isNull();
     }
 
     /**
@@ -58,7 +59,8 @@
      * @return Whether that Pointer is not the null Pointer.
      */
     public static boolean isNonNull(ComparableWord that) {
-        return that.notEqual(nullPointer());
+        /* This method will be deleted soon. */
+        return ((PointerBase) that).isNonNull();
     }
 
     /**