Revert "Build is broken, but it's the start of subclassing refactors"

This reverts commit 613a0854478f8073466a46bf04ae728215dd7743.