C3
Revert "C6"

This reverts commit 44ccb08bbf542e314bbfb30cd5fb5a16cc635bb1.
Revert "C5"

This reverts commit 5eee968dddc8433dab11461fda1b541d77d276c8.
Revert "C3"

This reverts commit 9c02075214d2d367b42015d6fdfc39585abd2230.