Rolled back mailbox_spec per @jcoyne's suggestion.