Bring back CSC from bloatware