I didn't! This is from the original discovery code ;-)  I think you are right, but I'm inclined to leave this untouched since this part of discovery may be changed shortly anyway as a result of other PRs