This mostly reverts commit 173805b2e7. Add "queries: security-and-quality" which should make a difference compared to before.
173805b2e7