Rerolled patch for commentsblock.