Reverted last commit's implementation of new comments, replaced with original one.