Revert CS fixes.