--- old/src/hotspot/share/classfile/systemDictionary.cpp	2018-03-08 13:53:58.181553973 -0500
+++ new/src/hotspot/share/classfile/systemDictionary.cpp	2018-03-08 13:53:57.601228401 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -2091,13 +2091,7 @@
   }
 
   if (init_opt == SystemDictionary::ValhallaClasses) {
-    if (EnableValhalla || EnableMVT) {
-      must_load = true;
-    } else {
-      return false;
-    }
-  } else if (init_opt == SystemDictionary::MVTClasses) {
-    if (EnableMVT) {
+    if (EnableValhalla) {
       must_load = true;
     } else {
       return false;