Reverting refactoring