Revert "C2"

This reverts commit 370f0ad90f008bce56b1124794050a309d9c05a1.