Revert "csc changes"

This reverts commit 2e506effc0d00971e9578a0c02bb0301fc0dc3dc.