Water heater by-pass