Revert "New Payload interface that properly maps to only a payload"

This reverts commit c5e21f829360b299e6ce2a1f6fe281be5bf69554.