Revert "Fixed payload issue, thanks to think.pink"

This reverts commit c66746b6548fcd1a729277d1741e923758b13dbe.