Fixes bug 1013494 - Remove Query model from the public API.

@peterbe r? (super small)