Revert bad CS fix (alternative CS behavior)