MNT: Undo aggressive refactor