No more custom patch for mutt