Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r29e57b5232f605a871c62580e16a7db297aae992 -r0d8381c50f7189c4cfbc2794a4aedf297eea7d15
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 29e57b5232f605a871c62580e16a7db297aae992)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 0d8381c50f7189c4cfbc2794a4aedf297eea7d15)
@@ -19,7 +19,6 @@
 
 #include "AlarmLamp.h"
 #include "OperationModes.h"
-#include "SafetyShutdown.h"
 #include "SystemCommMessages.h"
 #include "TaskGeneral.h"
 #include "Timers.h"
@@ -1045,12 +1044,11 @@
                     }
                 }
             }
-
+            // if we're in fault mode, go back to prior mode
+            testRestorePriorModeFromFault();
             result = TRUE;
         }
     }
-    // in case any previously active alarms had pulled safety shutdown, release safety
-    testResetSafetyShutdownOverride();
 
     return result;
 }