Removing hack in canonical-grouping-key