--- a/src/demo/share/java2d/J2DBench/src/j2dbench/ResultSet.java	Tue Mar 13 00:22:14 2018 -0700
+++ b/src/demo/share/java2d/J2DBench/src/j2dbench/ResultSet.java	Tue Mar 13 12:46:01 2018 -0400
@@ -77,7 +77,6 @@
         "line.separator",
         "file.separator",
         "file.encoding",
-        "file.encoding.pkg",
         "java.class.path",
         "java.library.path",
         "java.io.tmpdir",

--- a/src/java.base/share/native/libjava/System.c	Tue Mar 13 00:22:14 2018 -0700
+++ b/src/java.base/share/native/libjava/System.c	Tue Mar 13 12:46:01 2018 -0400
@@ -247,7 +247,6 @@
      *  user.language
      *  user.script, user.country, user.variant (if user's environment specifies them)
      *  file.encoding
-     *  file.encoding.pkg
      */
     PUTPROP(props, "user.language", sprops->language);
     if (sprops->script) {
@@ -266,7 +265,6 @@
     if (sprops->sun_stderr_encoding != NULL) {
         PUTPROP(props, "sun.stderr.encoding", sprops->sun_stderr_encoding);
     }
-    PUTPROP(props, "file.encoding.pkg", "sun.io");
 
     /* unicode_encoding specifies the default endianness */
     PUTPROP(props, "sun.io.unicode.encoding", sprops->unicode_encoding);

--- a/src/java.base/windows/native/libjava/java_props_md.c	Tue Mar 13 00:22:14 2018 -0700
+++ b/src/java.base/windows/native/libjava/java_props_md.c	Tue Mar 13 12:46:01 2018 -0400
@@ -629,7 +629,6 @@
      *  user.language
      *  user.script, user.country, user.variant (if user's environment specifies them)
      *  file.encoding
-     *  file.encoding.pkg
      */
     {
         /*