revert dquery dependency