Revert "Fix dkim tests affected by From canonicalisation"

This reverts commit dcbd08e4606ff8291b6cf55d193ce0c26393f11d.
diff --git a/yaml/gen-maven-dev-2017-11-mailarchivesao.yaml b/yaml/gen-maven-dev-2017-11-mailarchivesao.yaml
index 053cd5a..6553a50 100644
--- a/yaml/gen-maven-dev-2017-11-mailarchivesao.yaml
+++ b/yaml/gen-maven-dev-2017-11-mailarchivesao.yaml
@@ -4651,7 +4651,7 @@
       generated: 9jh8mw0qy1d1ccl3mh72nwyk070ktxpk
     - index: 278
       message-id: <CAKuVzBSyG-8Bnor7sezCp6z0Cv+Jng0o11HN4hBx10BjWCQnOw@mail.gmail.com>
-      generated: y9lg8tpqvokk64cxqdc9o02xn8cj6hjk
+      generated: 1808cpsmwjoj7gp4v3dllwd0zxxyolnd
     - index: 279
       message-id: <20171128225010.50B01E02F5@git1-us-west.apache.org>
       generated: 58po4s20tc32g9dvpc7dwwyt1lqtbkn2
diff --git a/yaml/gen-maven-dev-2017-11-mboxvm.yaml b/yaml/gen-maven-dev-2017-11-mboxvm.yaml
index 573dd41..c06055f 100644
--- a/yaml/gen-maven-dev-2017-11-mboxvm.yaml
+++ b/yaml/gen-maven-dev-2017-11-mboxvm.yaml
@@ -4651,7 +4651,7 @@
       generated: 9jh8mw0qy1d1ccl3mh72nwyk070ktxpk
     - index: 278
       message-id: <CAKuVzBSyG-8Bnor7sezCp6z0Cv+Jng0o11HN4hBx10BjWCQnOw@mail.gmail.com>
-      generated: y9lg8tpqvokk64cxqdc9o02xn8cj6hjk
+      generated: plhhj7by7j6gh6whzll6g5cc1xkthhd4
     - index: 279
       message-id: <20171128225010.50B01E02F5@git1-us-west.apache.org>
       generated: 58po4s20tc32g9dvpc7dwwyt1lqtbkn2
diff --git a/yaml/generators-dkim-multimbox.yaml b/yaml/generators-dkim-multimbox.yaml
index d7abf67..b6a75e0 100644
--- a/yaml/generators-dkim-multimbox.yaml
+++ b/yaml/generators-dkim-multimbox.yaml
@@ -2280,7 +2280,7 @@
       generated: np28c8dkbhwn0qm5rqg4j4o0zqyrto33
     - index: 758
       message-id: <CAKuVzBSyG-8Bnor7sezCp6z0Cv+Jng0o11HN4hBx10BjWCQnOw@mail.gmail.com>
-      generated: y9lg8tpqvokk64cxqdc9o02xn8cj6hjk
+      generated: 1808cpsmwjoj7gp4v3dllwd0zxxyolnd
     - index: 759
       message-id: <CAKuVzBT-CHFrLAs4r_Q6+hwnvirTqm3M08D6bmAase3X_XebJA@mail.gmail.com>
       generated: y8bb83qq9cw7ykqfs8168dfh5gmcq53v
@@ -5474,7 +5474,7 @@
       generated: np28c8dkbhwn0qm5rqg4j4o0zqyrto33
     - index: 758
       message-id: <CAKuVzBSyG-8Bnor7sezCp6z0Cv+Jng0o11HN4hBx10BjWCQnOw@mail.gmail.com>
-      generated: y9lg8tpqvokk64cxqdc9o02xn8cj6hjk
+      generated: 1808cpsmwjoj7gp4v3dllwd0zxxyolnd
     - index: 759
       message-id: <CAKuVzBT-CHFrLAs4r_Q6+hwnvirTqm3M08D6bmAase3X_XebJA@mail.gmail.com>
       generated: y8bb83qq9cw7ykqfs8168dfh5gmcq53v