diff --git a/lib/cli.py b/lib/cli.py
index cce3b31070365471dc1b85e8ffe7a6708755891f..e0ca5ff5ccb7027b4c4ca9edcde7a8427ecfeab3 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -421,7 +421,7 @@ def PollJob(job_id, cl=None, feedback_fn=None):
       if callable(feedback_fn):
         feedback_fn(msg)
       else:
-        print "%s %s" % (time.ctime(msg[0]), msg[2])
+        print "%s %s" % (time.ctime(utils.MergeTime(msg[0])), msg[2])
     lastmsg = msg
     time.sleep(1)
 
diff --git a/lib/jqueue.py b/lib/jqueue.py
index cbf43df8865e084670967ab53e446ca0e6485d6f..9f9709a37326d5fc8ad0fd8ab3f429799c3de961 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -98,7 +98,9 @@ class _QueuedOpCode(object):
 
     self._log_lock.acquire()
     try:
-      self.log.append((time.time(), log_type, log_msg))
+      # The time is split to make serialization easier and not lose more
+      # precision.
+      self.log.append((utils.SplitTime(time.time()), log_type, log_msg))
     finally:
       self._log_lock.release()