am 608aa91d: Merge "Revert "Use repeatable timestamps""

* commit '608aa91db7ef1c131e2c49b0ffd39851ff2b6e9d':
  Revert "Use repeatable timestamps"