Revert "Changes to the Payment Creation"

This reverts commit 0ee3c05a85cc7c31bab63e4bab7568a35a1c8b1b.