De-refactoring?