Make save/restore slightly less broken.