Add hack for now to get Q2 composites working again