MNT: Unrefactored an overzealous refactor