r79347 didn't update other callers to mungeQuery(), so let's just take the easy way...