Revert "Revert "With new analyzer""

This reverts commit 5f1b7850cfcf4ac2fc136586d1c7f17474fe0d85.