As pointed out on the -dev list, actually use the result of find_peer() so that