Fix the 'double free' crash on shutdown (#328011). Note that avc stuff
        still doesn't work, but at least this crash is gone, and I've got a
        better idea of where things are actually going awry...