Revert "Pick default interface for upstream."

This reverts commit 9e19867ce58a96eb681d62bf4e1dc9daeac8445c.