diff --git a/build.xml b/build.xml
index 9971c56f..a2927ca2 100644
--- a/build.xml
+++ b/build.xml
@@ -2046,13 +2046,11 @@
             <filterchain>
                 <tokenfilter>
                     <linetokenizer />
-                    <containsregex pattern="^\s*id:\s*([0-9a-fA-F\-]+)\s*$" />
+                    <containsregex pattern="id:" />
                 </tokenfilter>
                 <tokenfilter>
                     <stringtokenizer delims=":- \r\n" suppressdelims="true" />
-                    <containsregex
-                         pattern="^\s*id:\s*([0-9a-fA-F\-]+)\s*$"
-                         replace="\1" />
+                    <containsregex pattern="[0-9a-fA-F\-]+" />
                 </tokenfilter>
                 <striplinebreaks/>
             </filterchain>
@@ -2120,13 +2118,11 @@
             <filterchain>
                 <tokenfilter>
                     <linetokenizer />
-                    <containsregex pattern="^\s*id:\s*([0-9a-fA-F\-]+)\s*$" />
+                    <containsregex pattern="id:" />
                 </tokenfilter>
                 <tokenfilter>
                     <stringtokenizer delims=":- \r\n" suppressdelims="true" />
-                    <containsregex
-                         pattern="^\s*id:\s*([0-9a-fA-F\-]+)\s*$"
-                         replace="\1" />
+                    <containsregex pattern="[0-9a-fA-F\-]+" />
                 </tokenfilter>
                 <striplinebreaks/>
             </filterchain>