Do not remove the unit from the query graph.  Group by item removal happens during prepare phase.
Revert change after execution.