Revert accidental commit
QA: CS adjustments