Fix atavism

I accidentally failed to delete everything from a previous attempt to refactor this