Revert "Changes to comment sharing"

This reverts commit cc217aafb1d6ef0aae851576755be3ba08fa30b8.