Revert "QueryServlet refactor"

This reverts commit 2bf56058f8267a77cac45096a14f3dfdc479675c.