Rollback refactoring