Do we still need this branch?  Would we ever not have a SIPResolver?  (Probably applies above too.)