Revert "even more cc form fixes"

This reverts commit 2b01c534b28fbb9bc96985106c85ab96b20f0305.