Revert "Corpus overhaul!"

This reverts commit 47a1fb66935d194a94e3af6a0b7f864ddc296905.