Yes, bypass it. Depending on the connection style there's different ways to do it; including permanent ways with a kit or making one yourself. But, basically, connect the hot and cold lines together. Drain the tank via the spigot and that's it. Do not pump AF through it.
