diff --git a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
index 07b379cc..39221000 100644
--- a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "af0e2626081e066848c332179455f34e"
-Content-Length: 17701
+ETag: "6f968e0221076d26291d01911fda6a34"
+Content-Length: 17305
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -90,10 +90,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -245,10 +241,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -322,7 +314,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/.in/</href>
   <propstat>
    <prop>
-    <C:getctag>"0389feae460444b4b5db3b16c94b1e43"</C:getctag>
+    <C:getctag>"21af9d4e6b2213058ebcbdcae1d922e5"</C:getctag>
     <displayname>User 1 Inbox</displayname>
     <C1:supported-calendar-component-set>
      <C1:comp name="VEVENT"/>
@@ -505,10 +497,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/0541-iCal4-PROPFIND.result b/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
index c2b8e0de..dcc9f5bf 100644
--- a/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0541-iCal4-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "f37173f187202c0128fbd251363ade37"
-Content-Length: 1532
+ETag: "56a21ce4b95ce682912301bcd1184008"
+Content-Length: 1404
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -19,10 +19,6 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VEVENT"/>
      <C:comp name="VTODO"/>
      <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-     <C:comp name="VPOLL"/>
-     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <C:schedule-default-calendar-URL>
      <href>/caldav.php/user1/home/</href>
diff --git a/testing/tests/regression-suite/0547-iCal4-PROPFIND.result b/testing/tests/regression-suite/0547-iCal4-PROPFIND.result
index 601d7909..d5ec6748 100644
--- a/testing/tests/regression-suite/0547-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0547-iCal4-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "0c6e80ace8d360479d21cc6ebfcd3f6c"
-Content-Length: 20132
+ETag: "de1fc35a2cd3f9f00064956064a5e0de"
+Content-Length: 19736
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -103,10 +103,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -278,10 +274,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -366,7 +358,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/.in/</href>
   <propstat>
    <prop>
-    <C:getctag>"0389feae460444b4b5db3b16c94b1e43"</C:getctag>
+    <C:getctag>"21af9d4e6b2213058ebcbdcae1d922e5"</C:getctag>
     <displayname>User 1 Inbox</displayname>
     <C1:supported-calendar-component-set>
      <C1:comp name="VEVENT"/>
@@ -571,10 +563,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/0548-iCal-PROPFIND.result b/testing/tests/regression-suite/0548-iCal-PROPFIND.result
index ee17e3de..56ca612b 100644
--- a/testing/tests/regression-suite/0548-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0548-iCal-PROPFIND.result
@@ -4,8 +4,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "908ab117a03a63e9f130ae222c0f3477"
-Content-Length: 29891
+ETag: "5e049d81fbde6fc41dea951c5b5061c9"
+Content-Length: 29507
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -198,10 +198,6 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VEVENT"/>
      <C:comp name="VTODO"/>
      <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-     <C:comp name="VPOLL"/>
-     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <supported-report-set>
      <supported-report>
@@ -466,10 +462,6 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VEVENT"/>
      <C:comp name="VTODO"/>
      <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-     <C:comp name="VPOLL"/>
-     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <supported-report-set>
      <supported-report>
@@ -600,7 +592,7 @@ Content-Type: text/xml; charset="utf-8"
      </privilege>
     </current-user-privilege-set>
     <displayname>User 1 Inbox</displayname>
-    <C1:getctag>"0389feae460444b4b5db3b16c94b1e43"</C1:getctag>
+    <C1:getctag>"21af9d4e6b2213058ebcbdcae1d922e5"</C1:getctag>
     <owner>
      <href>/caldav.php/user1/</href>
     </owner>
@@ -876,10 +868,6 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VEVENT"/>
      <C:comp name="VTODO"/>
      <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-     <C:comp name="VPOLL"/>
-     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <supported-report-set>
      <supported-report>
diff --git a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
index 82c07e5e..1060161f 100644
--- a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "badcdb23956a17ef94ec1b98cd36f6fe"
-Content-Length: 12994
+ETag: "66df016724633c5e5cefc1fc7fb1e882"
+Content-Length: 12598
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -76,10 +76,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -200,10 +196,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -263,7 +255,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <displayname>User 1 Inbox</displayname>
-    <C:getctag>"0389feae460444b4b5db3b16c94b1e43"</C:getctag>
+    <C:getctag>"21af9d4e6b2213058ebcbdcae1d922e5"</C:getctag>
     <C1:supported-calendar-component-set>
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
@@ -415,10 +407,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
index 82c07e5e..1060161f 100644
--- a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "badcdb23956a17ef94ec1b98cd36f6fe"
-Content-Length: 12994
+ETag: "66df016724633c5e5cefc1fc7fb1e882"
+Content-Length: 12598
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -76,10 +76,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -200,10 +196,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -263,7 +255,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <displayname>User 1 Inbox</displayname>
-    <C:getctag>"0389feae460444b4b5db3b16c94b1e43"</C:getctag>
+    <C:getctag>"21af9d4e6b2213058ebcbdcae1d922e5"</C:getctag>
     <C1:supported-calendar-component-set>
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
@@ -415,10 +407,6 @@ Content-Type: text/xml; charset="utf-8"
      <C1:comp name="VEVENT"/>
      <C1:comp name="VTODO"/>
      <C1:comp name="VJOURNAL"/>
-     <C1:comp name="VTIMEZONE"/>
-     <C1:comp name="VFREEBUSY"/>
-     <C1:comp name="VPOLL"/>
-     <C1:comp name="VAVAILABILITY"/>
     </C1:supported-calendar-component-set>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/0558-iPhone-PROPFIND.result b/testing/tests/regression-suite/0558-iPhone-PROPFIND.result
index ef1bf9eb..0e15c650 100644
--- a/testing/tests/regression-suite/0558-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/0558-iPhone-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "23d5188e972ee46de551b1dd2cf1073a"
-Content-Length: 4933
+ETag: "9057a2847bd4becabc777dab5decf806"
+Content-Length: 4549
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -36,10 +36,6 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VEVENT"/>
      <C:comp name="VTODO"/>
      <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-     <C:comp name="VPOLL"/>
-     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -77,10 +73,6 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VEVENT"/>
      <C:comp name="VTODO"/>
      <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-     <C:comp name="VPOLL"/>
-     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
@@ -135,10 +127,6 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VEVENT"/>
      <C:comp name="VTODO"/>
      <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-     <C:comp name="VPOLL"/>
-     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/0562-iOS-PROPFIND.result b/testing/tests/regression-suite/0562-iOS-PROPFIND.result
index 5197ec7e..341bdc96 100644
--- a/testing/tests/regression-suite/0562-iOS-PROPFIND.result
+++ b/testing/tests/regression-suite/0562-iOS-PROPFIND.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "ad7ec8d22f626f3c8f86c0a275847c93"
-Content-Length: 997
+ETag: "e3f182ebd3a46d6b4cd39b6d69823e3f"
+Content-Length: 869
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -20,10 +20,6 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VEVENT"/>
      <C:comp name="VTODO"/>
      <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-     <C:comp name="VPOLL"/>
-     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result
index 4838d282..eaea5200 100644
--- a/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result
+++ b/testing/tests/regression-suite/0918-PROPFIND-supported-stuff.result
@@ -2,8 +2,8 @@ HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "d8ca6e096e4f41c01747fcc58a8e822f"
-Content-Length: 2155
+ETag: "25501a258bef17f959a7045cac35322a"
+Content-Length: 2027
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -73,10 +73,6 @@ Content-Type: text/xml; charset="utf-8"
      <C:comp name="VEVENT"/>
      <C:comp name="VTODO"/>
      <C:comp name="VJOURNAL"/>
-     <C:comp name="VTIMEZONE"/>
-     <C:comp name="VFREEBUSY"/>
-     <C:comp name="VPOLL"/>
-     <C:comp name="VAVAILABILITY"/>
     </C:supported-calendar-component-set>
     <C:supported-calendar-data>text/calendar</C:supported-calendar-data>
    </prop>