Revert fixes related to multiple payments

This reverts commit 5610ec6136b591e8b6fab6817d549a4d42c09d0a.