Revert "Comment improvements."

This reverts commit 6516f3a58d12a23b917efd8bce8d797713e0b1d1.