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

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