Revert "finalish cc form changes"

This reverts commit a3d1426ba0116fa0c16dcddc4e4447ee16bffdca.