Revert "potential fix for messed up group feature labeling"

This reverts commit 77f41be91516a75ebf041fec50861d08af5e3d29.
real fix for confusing labeling problems