Revert "Deal with CM changing vars (WITH_QC_PERF) for no reason, and still be able to"

This reverts commit ecec401e2886eb8504a97fc0726c7f8e7c159fe1.