The query was re-written *after* we had tagged it with NON_AGG_FIELD_USED.
Remove the flag before continuing.