Revert "Use Wallace's schema"

This reverts commit 5099ed45563e1a35d5fd18041acec2394217ff8c.