Fixing regression that completely broke time calculation in ping

Change-Id: Ie8eb3e1ec29d10fbaed4ba0cf073caaeeb8ab487
Refs: #6