This fixes #7839.  It now checks to see if the analysis is enabled.