I'd hate to see the attraction go away completely, but I would like to see it completely revamped. Were I in charge of DHS, it would become the backlot special effects tour.
It would still begin in the water tank area, but it would be completely redone to be a water stunt/special effects...