yep, botched refactoring.