Return to the old code, improve the comment.