Everything restored.

I've screwed it up, but now it's fixed.