Remove duplicate source of truth with buffers.
Merge pull request #345 from kramerc/remove-duplicate-sot-with-buffers

Remove duplicate source of truth with buffers.