grouper: fix vendor hacks

Change-Id: I7fa6a51a77af1ea868f61372cd05f4e4fd6fe68a