Fix timestamp recording and presentation.  Again.