am b12a4a07: (-s ours) Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev

* commit 'b12a4a07ba79b847a23436f51e01ef5652b9b227':
  Revert sendEnvelope changes [DO NOT MERGE]