It was decided in a code review that mode 2 wasn't doing exactly as we wanted and that it probably wasn't required, at least for now. Changes to logic so that the position restore is only done after a power cycle and not a download, reset cold or reset origin.