Are you sure about that? I tried that originally, and it broke tests. This was meant to replace this: https://github.com/mozilla-b2g/gaia-email-libs-and-more/pull/195/files#L10L750