Follow up r78786. Do not mark as @deprecated yet, since it is called by getQueryInfo().