Address the OOMs that are occurring on compile-dist-test for this variant, and then any other issues that may crop up once we get that task working again. Re-enable the variant once it's green.