Bypass within or surrounds heat exchanger