Revert "Revert "Comments""

This reverts commit d8278020944d6af787717b72f31d06ba9f027c68.