Undo some refactoring