Revert "Simplify nexthop resolution."
Revert "Simplify nexthop resolution."

This reverts commit b37f0bfd2634c738341d4fc042df6ce09c46409e.

gizmoguy/faucet,faucetsdn/faucet,faucetsdn/faucet,anarkiwi/faucet,shivarammysore/faucet,wackerly/faucet,wackerly/faucet,anarkiwi/faucet,isomer/faucet,Bairdo/faucet,mwutzke/faucet,trungdtbk/faucet,Bairdo/faucet,REANNZ/faucet,trentindav/faucet,trentindav/faucet,gizmoguy/faucet,byllyfish/faucet,isomer/faucet,REANNZ/faucet,shivarammysore/faucet,byllyfish/faucet,trungdtbk/faucet,mwutzke/faucet