946828 - remove more unix time calls
Merge pull request #1725 from lonnen/946828-moar-timing-improvements

946828 - remove more unix time calls