[Components] Fix random CS rules.

Replaces #1302.