The saving/restoring is still completely busted. Not sure what's going on.
And it finally works.