Rollback some changes of previous refactoring