Queries decide whether or not to buffer results based on whether a callback is provided, so this change would always provide a callback and force buffering to happen even when the user doesn't expect it.