diff --git a/Android.mk b/Android.mk
index 28f6511..4c83960 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,12 +35,6 @@
 ifeq ($(AB_OTA_UPDATER),true)
 LOCAL_CFLAGS += -DAB_OTA_UPDATER
 endif # ifeq ($(AB_OTA_UPDATER),true)
-ifeq ($(DISABLE_DUMPSTATE_ON_NIGHTLY),true)
-LOCAL_CFLAGS += -DISABLE_DUMPSTATE_ON_NIGHTLY
-endif # ifeq ($(DISABLE_DUMPSTATE_ON_NIGHTLY),true)
-ifeq ($(DISABLE_DUMPSTATE_ON_FDR),true)
-LOCAL_CFLAGS += -DISABLE_DUMPSTATE_ON_FDR
-endif # ifeq ($(DISABLE_DUMPSTATE_ON_FDR),true)
 ifeq ($(REMOVE_UMA_CONTENT_FROM_FTS),true)
 LOCAL_CFLAGS += -DREMOVE_UMA_CONTENT_FROM_FTS
 endif # ifeq ($(REMOVE_UMA_CONTENT_FROM_FTS),true)
diff --git a/src/shutdown.c b/src/shutdown.c
index 97d5964..c168f48 100644
--- a/src/shutdown.c
+++ b/src/shutdown.c
@@ -51,8 +51,6 @@
 #include <cutils/properties.h>
 
 static const char kPropertyLastRebootSource[] = "persist.chrome.last_reboot.src";
-static const char kRebootSourceNightlyReboot[] = "3";
-static const char kRebootSourceFdrReboot[] = "8";
 
 // ::metrics::CastLogsProto_CastDeviceInfo::RebootType::REBOOT_TYPE_WATCHDOG
 static const char kLastRebootTypeWatchdog[] = "5";
@@ -363,29 +361,8 @@
     sync();
 
 #ifdef DUMPSTATE_FILENAME
-#if defined(DISABLE_DUMPSTATE_ON_FDR) || defined(DISABLE_DUMPSTATE_ON_NIGHTLY)
-    char value[PROPERTY_VALUE_MAX + 1];
-    bool skip = false;
-    property_get(kPropertyLastRebootSource, value, "");
-#ifdef DISABLE_DUMPSTATE_ON_FDR
-    if (strcmp(value, kRebootSourceFdrReboot) == 0) {
-      syslog(LOG_INFO, "Skipping dumpstate for FDR.");
-      skip = true;
-    }
-#endif
-#ifdef DISABLE_DUMPSTATE_ON_NIGHTLY
-    if (strcmp(value, kRebootSourceNightlyReboot) == 0) {
-      syslog(LOG_INFO, "Skipping dumpstate for nightly reboot.");
-      skip = true;
-    }
-#endif
-    if (!skip) {
-      watchdog_dumpstate();
-    }
-#else
     watchdog_dumpstate();
 #endif
-#endif
 
 #if !defined(BUILD_EUREKA)
     /* if we will halt the system we should try to tell a sysadmin */
diff --git a/src/watchdog_upload_util.c b/src/watchdog_upload_util.c
index ba4cdc7..c287988 100644
--- a/src/watchdog_upload_util.c
+++ b/src/watchdog_upload_util.c
@@ -144,8 +144,7 @@
       "\"logfile\":\"%s\","
       "\"build_number\":\"%s\","
       "\"release_version\":\"%s\","
-      "\"reason\":\"Watchdog reset: %s\","
-      "\"signature\":\"%s\""
+      "\"reason\":\"Watchdog reset: %s\""
       "}\n";
 
   char build_number[PROPERTY_VALUE_MAX];
@@ -157,8 +156,7 @@
   property_get(kWatchdogReason, reason, "0");
 
   snprintf(lock_line, sizeof(lock_line), fmt, buf, kMinidumpFile,
-           kDumpstateFileCopy, build_number, release_version, reason,
-           "watchdog-restart");
+           kDumpstateFileCopy, build_number, release_version, reason);
   // Update lockfile
   fd = open(kLockFile, O_RDWR | O_APPEND, 0660);
   if (fd < 0) {