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