Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5960618dff4c2abf61dd707f94676539c4d1658b -rd694913cb85c7b3fe8835a007a750c5f5f78258e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5960618dff4c2abf61dd707f94676539c4d1658b)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d694913cb85c7b3fe8835a007a750c5f5f78258e)
@@ -42,7 +42,6 @@
 #include "TreatmentEnd.h"
 #include "TreatmentRecirc.h"
 #include "TreatmentStop.h"
-#include "Update.h"
 #include "Utilities.h"
 #include "Valves.h"
 #include "WatchdogMgmt.h"
@@ -8577,6 +8576,9 @@
  * @brief
  * The handleRebootNowRequest function handles a
  * request immediately jump to the bootloader application.
+ * The handleRebootNowRequest function handles a
+ * request to reboot the system. A software reset will cause the bootloader
+ * to stay active.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message : a pointer to the message to handle
@@ -8591,8 +8593,8 @@
 
     if (result)
     {
-        // Jump to the bootloader, there is no coming back from this.
-        startBootloader();
+        // Trigger a software reset.
+        systemREG1->SYSECR = (0x2) << 14;
     }
 }