gras: make output_buffer_queues match previous logic