Don't lie about what function makes a query

Change-Id: I60a34eb238500147e3f5bade3d6dc19449ee3f65
Merge "Don't lie about what function makes a query"