partial revert of ignore analyses refactor