applying W/A until new mailbox type cannot be used in default-dispatcher config