Change how the comments tag works.

Change-Id: Iaedd7a33f7ba175b76e183788dcd5547c03ddd0c