Revert "Allow the Collector to discard queries where the client has given up, #2983"

This reverts commit 90cffd268ac786b9e787eb336fd79822f079d3d6. which simply doesn't work unless the clocks are perfectly synchronized between machines.
Merge branch 'V7_9_5-branch'