Unfork Zetacomponents mail and use patch to apply differences