--- a/hotspot/src/share/vm/runtime/arguments.cpp	Tue Dec 20 21:45:13 2016 +0000
+++ b/hotspot/src/share/vm/runtime/arguments.cpp	Tue Dec 20 22:53:45 2016 +0100
@@ -28,7 +28,6 @@
 #include "classfile/moduleEntry.hpp"
 #include "classfile/stringTable.hpp"
 #include "classfile/symbolTable.hpp"
-#include "code/codeCacheExtensions.hpp"
 #include "gc/shared/cardTableRS.hpp"
 #include "gc/shared/genCollectedHeap.hpp"
 #include "gc/shared/referenceProcessor.hpp"
@@ -1885,7 +1884,6 @@
 #endif // _LP64
 #endif // !ZERO
 
-  CodeCacheExtensions::set_ergonomics_flags();
 }
 
 void Arguments::set_parallel_gc_flags() {