--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -1669,18 +1669,21 @@
   },
   "BAD_FALLBACK_FONT": {
     "record_in_processes": ["main", "content"],
     "expires_in_version": "never",
     "kind": "boolean",
     "description": "system fallback font can't be used"
   },
   "SHUTDOWN_OK": {
-    "record_in_processes": ["main", "content"],
-    "expires_in_version": "default",
+    "record_in_processes": ["main"],
+    "expires_in_version": "never",
+    "alert_emails": ["chutten@mozilla.com"],
+    "bug_numbers": [1421688],
+    "releaseChannelCollection": "opt-out",
     "kind": "boolean",
     "description": "Did the browser start after a successful shutdown"
   },
   "IMAGE_DECODE_LATENCY_US": {
     "record_in_processes": ["main", "content"],
     "alert_emails": ["gfx-telemetry-alerts@mozilla.com"],
     "expires_in_version": "never",
     "kind": "exponential",

--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -500,17 +500,16 @@
     "SERVICE_WORKER_REGISTRATIONS",
     "SERVICE_WORKER_REGISTRATION_LOADING",
     "SERVICE_WORKER_REQUEST_PASSTHROUGH",
     "SERVICE_WORKER_SPAWN_ATTEMPTS",
     "SERVICE_WORKER_UPDATED",
     "SERVICE_WORKER_WAS_SPAWNED",
     "SHOULD_AUTO_DETECT_LANGUAGE",
     "SHOULD_TRANSLATION_UI_APPEAR",
-    "SHUTDOWN_OK",
     "SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE",
     "SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_TEARDOWN",
     "SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION",
     "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
     "SLOW_ADDON_WARNING_RESPONSE_TIME",
     "SLOW_ADDON_WARNING_STATES",
     "STARTUP_CRASH_DETECTED",
     "STARTUP_MEASUREMENT_ERRORS",
@@ -1213,17 +1212,16 @@
     "SERVICE_WORKER_REGISTRATIONS",
     "SERVICE_WORKER_REGISTRATION_LOADING",
     "SERVICE_WORKER_REQUEST_PASSTHROUGH",
     "SERVICE_WORKER_SPAWN_ATTEMPTS",
     "SERVICE_WORKER_UPDATED",
     "SERVICE_WORKER_WAS_SPAWNED",
     "SHOULD_AUTO_DETECT_LANGUAGE",
     "SHOULD_TRANSLATION_UI_APPEAR",
-    "SHUTDOWN_OK",
     "SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_BEFORE_CHANGE",
     "SHUTDOWN_PHASE_DURATION_TICKS_PROFILE_CHANGE_TEARDOWN",
     "SHUTDOWN_PHASE_DURATION_TICKS_QUIT_APPLICATION",
     "SHUTDOWN_PHASE_DURATION_TICKS_XPCOM_WILL_SHUTDOWN",
     "SLOW_ADDON_WARNING_RESPONSE_TIME",
     "SLOW_ADDON_WARNING_STATES",
     "SLOW_SCRIPT_NOTICE_COUNT",
     "SPDY_CHUNK_RECVD",
@@ -1641,17 +1639,16 @@
     "FX_SESSION_RESTORE_STARTUP_INIT_SESSION_MS",
     "FX_SESSION_RESTORE_WRITE_FILE_MS",
     "FX_THUMBNAILS_BG_CAPTURE_PAGE_LOAD_TIME_MS",
     "REQUESTS_OF_ORIGINAL_CONTENT",
     "NEWTAB_PAGE_ENHANCED",
     "CERT_CHAIN_SHA1_POLICY_STATUS",
     "PDF_VIEWER_DOCUMENT_SIZE_KB",
     "FX_THUMBNAILS_BG_CAPTURE_SERVICE_TIME_MS",
-    "SHUTDOWN_OK",
     "PLACES_BACKUPS_TOJSON_MS",
     "A11Y_ISIMPLEDOM_USAGE_FLAG",
     "FX_SESSION_RESTORE_MANUAL_RESTORE_DURATION_UNTIL_EAGER_TABS_RESTORED_MS",
     "PDF_VIEWER_DOCUMENT_GENERATOR",
     "PDF_VIEWER_FALLBACK_SHOWN",
     "FX_SESSION_RESTORE_ALL_FILES_CORRUPT",
     "SHOULD_AUTO_DETECT_LANGUAGE",
     "A11Y_IATABLE_USAGE_FLAG",