Revert "Skip content field merging from endpoint with null sink"
The issue with throughput was found (async unordering of rerenders), and this wasn't the culprit. Revert to bring things back in line and have the null sink do most of the normal work.
This reverts commit 8873f1ed.