Partial revert r78450: doQuery() and query() are not the same. You can't just swap...