diff -r 88b76c19d8eb -r 5201c9474ee7 src/hotspot/share/runtime/compilationPolicy.cpp
--- a/src/hotspot/share/runtime/compilationPolicy.cpp	Wed May 09 07:48:31 2018 +0100
+++ b/src/hotspot/share/runtime/compilationPolicy.cpp	Wed May 09 09:39:25 2018 +0200
@@ -33,7 +33,6 @@
 #include "oops/method.inline.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/nativeLookup.hpp"
-#include "runtime/advancedThresholdPolicy.hpp"
 #include "runtime/compilationPolicy.hpp"
 #include "runtime/frame.hpp"
 #include "runtime/handles.inline.hpp"
@@ -74,15 +73,8 @@
     Unimplemented();
 #endif
     break;
-  case 3:
-#ifdef TIERED
-    CompilationPolicy::set_policy(new AdvancedThresholdPolicy());
-#else
-    Unimplemented();
-#endif
-    break;
   default:
-    fatal("CompilationPolicyChoice must be in the range: [0-3]");
+    fatal("CompilationPolicyChoice must be in the range: [0-2]");
   }
   CompilationPolicy::policy()->initialize();
 }