Revert some cs fixing