reverting bad refactoring