Revert "Prefer ByteSource payload"

This reverts commit 0e3d1475ab50e1232d5eac16eee1d3a207e36f42.