--- a/src/hotspot/share/aot/aotLoader.cpp	Tue Oct 30 18:06:35 2018 -0400
+++ b/src/hotspot/share/aot/aotLoader.cpp	Tue Oct 30 15:17:58 2018 -0700
@@ -47,13 +47,8 @@
     return;
   }
   if (UseAOT) {
-    if (JvmtiExport::can_hotswap_or_post_breakpoint()) {
-      if (PrintAOT) {
-        warning("JVMTI capability to hotswap and post breakpoint is not compatible with AOT (switching AOT off)");
-      }
-      FLAG_SET_DEFAULT(UseAOT, false);
-      return;
-    }
+    // We allow hotswap to be enabled after the onload phase, but not breakpoints
+    assert(!JvmtiExport::can_post_breakpoint(), "AOT should have been disabled.");
     FOR_ALL_AOT_HEAPS(heap) {
       (*heap)->load_klass_data(ik, thread);
     }
@@ -120,9 +115,9 @@
       return;
     }
 
-    if (JvmtiExport::can_hotswap_or_post_breakpoint()) {
+    if (JvmtiExport::can_post_breakpoint()) {
       if (PrintAOT) {
-        warning("JVMTI capability to hotswap and post breakpoint is not compatible with AOT (switching AOT off)");
+        warning("JVMTI capability to post breakpoint is not compatible with AOT (switching AOT off)");
       }
       FLAG_SET_DEFAULT(UseAOT, false);
       return;