[#7114] Pass in nbhd instead of querying

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>