Fix component group regression.
Merge pull request #1457 from palantir/fix_group

Fix component group regression.