Switch from the chrono clock feature to now (#1569)

Switch from the chrono clock feature to now (#1569) #4310