Revert earlier timestamp stuff pending contact with Intel over apparent HMP brokenness