Catch up with r186809, correct comments.