Remove a quick hack disabling some analysis that is no longer required and breaks things that expect it to work.

Fixes #50