Revert "bacon: [HACK] Workaround for dynamic buffer issue"

This reverts commit a6c3a616692e5ec1bc52cd90262d9e0be6d50bf3.

Change-Id: I8da3c46de19b5cc79ad39d2b0f79d696d586fc42
(cherry picked from commit 8eb6959ede5b7d354c24e7ab55a8ce35e0ef9ad7)