Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r57007cd9fc64466a979f6613763a243d77743117 -r4df3087b3b1944c60cd33c752a81c3fdba19189f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 57007cd9fc64466a979f6613763a243d77743117)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4df3087b3b1944c60cd33c752a81c3fdba19189f)
@@ -643,11 +643,8 @@
     U32 years;
     memcpy(&years, &message->payload[5], sizeof(U32));
 
-    // TODO: Change setRTCTimestamp to return a boolean for this
-    result = TRUE;
+    result = setRTCTimestamp( seconds, minutes, hours, days, months, years );
 
-    setRTCTimestamp( seconds, minutes, hours, days, months, years );
-
     // respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }