am a8974d3f: Merge "Clean up (some of) our many clocks to use H instead of k."

* commit 'a8974d3f0a799a5d76e226649c878a71b3b5e953':
  Clean up (some of) our many clocks to use H instead of k.