Should I switch Cloudmailin to a fresh hash as well? In a separate pull request?