(if we decide to kill multiple payment abstraction we can also kill this cruft)