Updated for the "no proxy" case