Fix refactoring fallout