Revert 4 comments