Bug 4644 : Reverting workaround for Tunnel deletion issue