Was pre-refactoring stuff.