Fixes #3801, C4 will no longer destroy the analyzer it's inside of

Committed to dev-freeze because the fix doesn't work with the click code on master