--- a/src/hotspot/share/prims/jvmtiEnv.cpp	Wed Oct 03 23:00:32 2018 -0700
+++ b/src/hotspot/share/prims/jvmtiEnv.cpp	Mon Oct 15 14:16:35 2018 -0700
@@ -540,13 +540,6 @@
       record_class_file_load_hook_enabled();
     }
 
-    if (event_type == JVMTI_EVENT_SAMPLED_OBJECT_ALLOC) {
-      if (enabled) {
-        ThreadHeapSampler::enable();
-      } else {
-        ThreadHeapSampler::disable();
-      }
-    }
     JvmtiEventController::set_user_enabled(this, (JavaThread*) NULL, event_type, enabled);
   } else {
     // We have a specified event_thread.