Revert "C2"

This reverts commit 6f4bf794ddf3e8057d82c7dbe877f5a2a7ef2183.