Fix issues with new way of calculating drift after rebooting

The new way of calculating drift after rebooting was causing errors for some people, so I have reverted that. This version will still have the more accurate round trip data that should work for up to about month old data with little to no drift.