Merge "Revert "Use repeatable timestamps""