Merge "Revert "Expose sendEnvelope.""