Yes, this was handled correctly before. But when debugging such a case, we dived into the pick-from-theirs handling which seemed a little bit confusing to me.

But you are right, the comment is wrong and I have changed it.