Revert: Updating queries for the stream to be faster #5014

Unfortunately there is currently no better solution.