Repaired reboot to save/restore initial resolver context