WIP: Use minimum buffers.

Change-Id: I216c1108853d87378de2773b653d8ccd1e1fd505