I haven't checked the behavior yet, but clearly, this behavior needs to stay, and I think that the comment needs to stay somewhere too.