Revert "CC 8.2"

This reverts commit f08b31acf405af02fb3bd7d79674e0dc7209d3f1.
Revert "Revert "CC 8.2""

This reverts commit 384bd89c52d1b96a1fea9926618e89fe51065985.