Fix #811: Remove deserialization hacks.

Aahh! 200 lines removed :-)