Revert back CS fixes