Revert overzealous refactoring