--- old/make/common/Modules.gmk	2016-04-29 21:59:06.000000000 -0700
+++ new/make/common/Modules.gmk	2016-04-29 21:59:06.000000000 -0700
@@ -77,7 +77,6 @@
     java.scripting \
     java.sql.rowset \
     java.smartcardio \
-    jdk.charsets \
     jdk.naming.rmi \
     #
 
@@ -105,6 +104,7 @@
 
 PLATFORM_MODULES += \
     jdk.accessibility \
+    jdk.charsets \
     jdk.crypto.ec \
     jdk.crypto.pkcs11 \
     jdk.dynalink \