--- a/dom/base/Navigator.cpp
+++ b/dom/base/Navigator.cpp
@@ -613,18 +613,16 @@ Navigator::GetDoNotTrack(nsAString &aRes
   } else {
     aResult.AssignLiteral("unspecified");
   }
 }
 
 bool
 Navigator::JavaEnabled(CallerType aCallerType, ErrorResult& aRv)
 {
-  Telemetry::AutoTimer<Telemetry::CHECK_JAVA_ENABLED> telemetryTimer;
-
   // Return true if we have a handler for the java mime
   nsAutoString javaMIME;
   Preferences::GetString("plugin.java.mime", javaMIME);
   NS_ENSURE_TRUE(!javaMIME.IsEmpty(), false);
 
   if (!mMimeTypes) {
     if (!mWindow) {
       aRv.Throw(NS_ERROR_UNEXPECTED);

--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3983,24 +3983,16 @@
     "record_in_processes": ["main", "content"],
     "alert_emails": ["perf-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",
     "high": 3000,
     "n_buckets": 10,
     "description": "Time spent scanning filesystem for plugins (ms)"
   },
-  "CHECK_JAVA_ENABLED": {
-    "record_in_processes": ["main", "content"],
-    "expires_in_version": "default",
-    "kind": "exponential",
-    "high": 3000,
-    "n_buckets": 10,
-    "description": "Time spent checking if Java is enabled (ms)"
-  },
   "PLUGIN_HANG_UI_USER_RESPONSE": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 3,
     "description": "User response to Plugin Hang UI"
   },
   "PLUGIN_HANG_UI_DONT_ASK": {

--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -89,17 +89,16 @@
     "CANVAS_WEBGL_USED",
     "CERT_CHAIN_KEY_SIZE_STATUS",
     "CERT_CHAIN_SHA1_POLICY_STATUS",
     "CHANGES_OF_DETECTED_LANGUAGE",
     "CHANGES_OF_TARGET_LANGUAGE",
     "CHARSET_OVERRIDE_SITUATION",
     "CHARSET_OVERRIDE_USED",
     "CHECK_ADDONS_MODIFIED_MS",
-    "CHECK_JAVA_ENABLED",
     "COMPONENTS_SHIM_ACCESSED_BY_CONTENT",
     "COMPOSITE_FRAME_ROUNDTRIP_TIME",
     "COMPOSITE_TIME",
     "CONTENT_DOCUMENTS_DESTROYED",
     "CRASH_STORE_COMPRESSED_BYTES",
     "DATABASE_LOCKED_EXCEPTION",
     "DATABASE_SUCCESSFUL_UNLOCK",
     "DATA_STORAGE_ENTRIES",
@@ -596,17 +595,16 @@
     "CERT_VALIDATION_HTTP_REQUEST_FAILED_TIME",
     "CERT_VALIDATION_HTTP_REQUEST_RESULT",
     "CERT_VALIDATION_HTTP_REQUEST_SUCCEEDED_TIME",
     "CHANGES_OF_DETECTED_LANGUAGE",
     "CHANGES_OF_TARGET_LANGUAGE",
     "CHARSET_OVERRIDE_SITUATION",
     "CHARSET_OVERRIDE_USED",
     "CHECK_ADDONS_MODIFIED_MS",
-    "CHECK_JAVA_ENABLED",
     "COMPONENTS_SHIM_ACCESSED_BY_CONTENT",
     "COMPOSITE_FRAME_ROUNDTRIP_TIME",
     "COMPOSITE_TIME",
     "CONTENT_DOCUMENTS_DESTROYED",
     "COOKIE_SCHEME_SECURITY",
     "CRASH_STORE_COMPRESSED_BYTES",
     "CYCLE_COLLECTOR",
     "CYCLE_COLLECTOR_ASYNC_SNOW_WHITE_FREEING",
@@ -1430,17 +1428,16 @@
     "OSFILE_WRITEATOMIC_JANK_MS",
     "STARTUP_MEASUREMENT_ERRORS",
     "CERT_CHAIN_KEY_SIZE_STATUS",
     "CHANGES_OF_TARGET_LANGUAGE",
     "FX_NEW_WINDOW_MS",
     "PDF_VIEWER_TIME_TO_VIEW_MS",
     "SSL_OCSP_MAY_FETCH",
     "MOZ_SQLITE_OTHER_READ_B",
-    "CHECK_JAVA_ENABLED",
     "TRANSLATION_OPPORTUNITIES",
     "NEWTAB_PAGE_BLOCKED_SITES_COUNT",
     "FX_SESSION_RESTORE_NUMBER_OF_TABS_RESTORED",
     "WEAVE_START_COUNT",
     "FX_SESSION_RESTORE_RESTORE_WINDOW_MS",
     "HTTP_DISK_CACHE_OVERHEAD",
     "FX_SESSION_RESTORE_CORRUPT_FILE",
     "FX_TAB_CLICK_MS",