Revert "Rewriting db-fetch-query-results"