RE: [VETO] Revert buffer patch