For ENG-5962, more mucking around to get the mailbox construction dance right