Revert "revert c changes"

This reverts commit 5d6638d74b1619b2b7fe7f6db7b9a76b3914ef31.