[v9_16] Fix destination port extraction for client queries
Backport of !6191 (merged). A second pair of eyes would be useful for a sanity
check due to code drift between v9_16
and main
. This MR also
removes an outdated comment.
Closes #3309 (closed)