Fix hasty refactoring.