Revert "cherrypick: Check for duplicated mailboxes and correct if found"

This reverts commit 327a90cb1d0bf6d649e28e678b0d72f6bd86c14d

Change-Id: I70f71259780a133a283e095b12ee038552135f6f
2 files changed