Index: /trunk/src/VBox/VMM/VMMR3/TM.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/TM.cpp	(revision 65896)
+++ /trunk/src/VBox/VMM/VMMR3/TM.cpp	(revision 65897)
@@ -2631,9 +2631,10 @@
     if (RT_FAILURE(rc))
         return rc;
-#if 1 /* Workaround for accidental state shift in r47786 (2009-05-26 19:12:12). */  /** @todo remove this in a few weeks! */
+
+    /* TMTIMERSTATE_SAVED_XXX: Workaround for accidental state shift in r47786 (2009-05-26 19:12:12). */
     if (    u8State == TMTIMERSTATE_SAVED_PENDING_STOP + 1
         ||  u8State == TMTIMERSTATE_SAVED_PENDING_SCHEDULE + 1)
         u8State--;
-#endif
+
     if (    u8State != TMTIMERSTATE_SAVED_PENDING_STOP
         &&  u8State != TMTIMERSTATE_SAVED_PENDING_SCHEDULE)
@@ -2709,9 +2710,10 @@
     if (RT_FAILURE(rc))
         return rc;
-#if 1 /* Workaround for accidental state shift in r47786 (2009-05-26 19:12:12). */  /** @todo remove this in a few weeks! */
+
+    /* TMTIMERSTATE_SAVED_XXX: Workaround for accidental state shift in r47786 (2009-05-26 19:12:12). */
     if (    u8State == TMTIMERSTATE_SAVED_PENDING_STOP + 1
         ||  u8State == TMTIMERSTATE_SAVED_PENDING_SCHEDULE + 1)
         u8State--;
-#endif
+
     if (    u8State != TMTIMERSTATE_SAVED_PENDING_STOP
         &&  u8State != TMTIMERSTATE_SAVED_PENDING_SCHEDULE)
@@ -2729,13 +2731,6 @@
         uint64_t u64Expire;
         rc = SSMR3GetU64(pSSM, &u64Expire);
-        if (RT_FAILURE(rc))
-            return rc;
-    }
-
-    /*
-     * On failure set SSM status.
-     */
-    if (RT_FAILURE(rc))
-        rc = SSMR3HandleSetStatus(pSSM, rc);
+    }
+
     return rc;
 }