Revert "Merge pull request #182 from GERey/fix-query-validator-tests"

This reverts commit df73ca2e9176aaad7ec00a27fe32869e3ca6bed8, reversing
changes made to 7dd337212529b920b07031d73b5521916bbe0ab9.
Disabled query validator until we merge in ES changes.