2nd attempt at fixing legacy mailbox imports