[DO NOT MERGE] Revert "Ensure correct payment amounts"

This reverts commit d8e83d367f105bf61387d869b47152606b655374.