Adding back in the kill_tunnel fix.  Addresses ts-1527