Properly reset epochs after timeShift()