--- old/test/valhalla/mvt/MVTTest.java	2017-06-21 13:11:33.000000000 -0700
+++ new/test/valhalla/mvt/MVTTest.java	2017-06-21 13:11:32.000000000 -0700
@@ -4,9 +4,7 @@
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
+ * published by the Free Software Foundation.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -61,12 +59,7 @@
     static final MethodHandle PRINT_POINT;
 
     static {
-        try {
-            DVT = MinimalValueTypes_1_0.getValueTypeClass(Point.class);
-        }
-        catch (ClassNotFoundException e) {
-            throw new RuntimeException(e);
-        }
+        DVT = MinimalValueTypes_1_0.getValueTypeClass(Point.class);
 
         Field[] fs = Point.class.getFields();