Fix random CS rules.
Merge pull request #1303 from stloyd/bugfix/components-cs-fix

[Components] Fix random CS rules.