Revert wrong CS changes