Restore the timestamp build flag. Some test code on the way.