restored comments that were auto-edited during refactoring