Alternative solution for #1035

Proposed solution for https://github.com/stellar/stellar-client/issues/1035 Please see the comments in the initial issue for reasons why I took this approach.