Much simpler now.  Note - since we're using the local GetModeProxy, it handles falling back (including to a direct connection), so we don't have to.