Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re85815f8334417aa2ffac8bc366d25ed72ab4e1e -ra8451b47c75daac4189cf58bfaa007606d559376
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e85815f8334417aa2ffac8bc366d25ed72ab4e1e)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a8451b47c75daac4189cf58bfaa007606d559376)
@@ -1012,11 +1012,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 );
 }