--- old/src/hotspot/share/runtime/arguments.cpp	2018-03-08 13:54:25.546876691 -0500
+++ new/src/hotspot/share/runtime/arguments.cpp	2018-03-08 13:54:24.794119041 -0500
@@ -2351,7 +2351,7 @@
     warning("ValueTypeReturnedAsFields is not supported on this platform");
   }
 
-  if (EnableMVT || EnableValhalla) {
+  if (EnableValhalla) {
     // C1 has no support for value types
     if (!FLAG_IS_DEFAULT(TieredCompilation)) {
       warning("TieredCompilation disabled because value types are not supported by C1");
@@ -2359,12 +2359,6 @@
     FLAG_SET_CMDLINE(bool, TieredCompilation, false);
   }
 
-  if (EnableMVT && EnableValhalla) {
-    jio_fprintf(defaultStream::error_stream(),
-        "Conflicting combination in option list: EnableMVT and EnableValhalla cannot be both enabled at the same time");
-    status = false;
-  }
-
   return status;
 }
 
@@ -3257,11 +3251,6 @@
     }
   }
 
-  if (EnableMVT) {
-    if (!create_property("valhalla.enableMVT", "true", InternalProperty)) {
-      return JNI_ENOMEM;
-    }
-  }
   if (EnableValhalla) {
     if (!create_property("valhalla.enableValhalla", "true", InternalProperty)) {
       return JNI_ENOMEM;
@@ -3493,11 +3482,6 @@
   UNSUPPORTED_OPTION(TieredCompilation);
 #endif
 
-  if (EnableMVT &&
-      !create_numbered_property("jdk.module.addmods", "jdk.incubator.mvt", addmods_count++)) {
-    return JNI_ENOMEM;
-  }
-
 #if INCLUDE_JVMCI
   if (EnableJVMCI &&
       !create_numbered_property("jdk.module.addmods", "jdk.internal.vm.ci", addmods_count++)) {
@@ -4385,7 +4369,7 @@
     FLAG_SET_DEFAULT(UseLoopCounter, true);
   }
 
-  if ((!EnableMVT && !EnableValhalla) || is_interpreter_only()) {
+  if (!EnableValhalla || is_interpreter_only()) {
     // Disable calling convention optimizations if value types are not supported
     ValueTypePassFieldsAsArgs = false;
     ValueTypeReturnedAsFields = false;