diff -r 6b1bac001aaf -r 99337f94b04d src/java.base/unix/native/libjava/java_props_md.c
--- a/src/java.base/unix/native/libjava/java_props_md.c	Sun Apr 28 12:34:49 2019 +0530
+++ b/src/java.base/unix/native/libjava/java_props_md.c	Mon Apr 29 10:16:58 2019 -0700
@@ -396,14 +396,12 @@
 
     /* Java 2D/AWT properties */
 #ifdef MACOSX
-    // Always the same GraphicsEnvironment and Toolkit on Mac OS X
-    sprops.graphics_env = "sun.awt.CGraphicsEnvironment";
+    // Always the same Toolkit on Mac OS X
     sprops.awt_toolkit = "sun.lwawt.macosx.LWCToolkit";
 
     // check if we're in a GUI login session and set java.awt.headless=true if not
     sprops.awt_headless = isInAquaSession() ? NULL : "true";
 #else
-    sprops.graphics_env = "sun.awt.X11GraphicsEnvironment";
     sprops.awt_toolkit = "sun.awt.X11.XToolkit";
 #endif