Revert overzealous refactoring.