Revert BufferQueue fixes