We need to revert JMC-6217, since we do not (yet) have third-party approval. See JMC-6283 for reintroducing it once we do have approval.
JMC-6217 Update mail.api and its dependencies