diff -r b83deb51ea70 -r ba98d1dccf30 src/hotspot/share/memory/metaspace.cpp
--- a/src/hotspot/share/memory/metaspace.cpp	Tue Sep 10 12:53:00 2019 +0200
+++ b/src/hotspot/share/memory/metaspace.cpp	Tue Sep 10 14:31:38 2019 +0200
@@ -747,7 +747,7 @@
   } else {
     vm_exit_during_initialization("Invalid value for MetaspaceReclaimStrategy: \"%s\".", MetaspaceReclaimStrategy);
   }
-  metaspace::Settings::initialize(strat, MetaspaceAlwaysUseClassSpace);
+  metaspace::Settings::initialize(strat);
 
   if (DumpSharedSpaces) {
     // Using large pages when dumping the shared archive is currently not implemented.