Fixed #1605 and various other simple_animal revive issues.

What it says on the tin.
Fixed #1605
One third of all open PRs is now mine.