Revert "Only extract embedded objects from payload if there is a payload"

This reverts commit 98e28630772090057d2e54fe664658ec4263dc59.