diff --git a/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref b/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref
--- a/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref
+++ b/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref
@@ -17,7 +17,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -68,7 +68,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -119,7 +119,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -170,7 +170,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -221,7 +221,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -272,7 +272,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -323,7 +323,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -374,7 +374,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -425,7 +425,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -476,7 +476,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -527,7 +527,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -578,7 +578,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -629,7 +629,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -680,7 +680,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -731,7 +731,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -782,7 +782,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -833,7 +833,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -884,7 +884,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -935,7 +935,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -986,7 +986,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -1037,7 +1037,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -1088,7 +1088,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -1139,7 +1139,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -1190,7 +1190,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -1241,7 +1241,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
diff --git a/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref b/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref
--- a/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref
+++ b/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref
@@ -24,22 +24,22 @@
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10
+RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10
 RDATE:20061029T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19880403T020000
-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
@@ -83,22 +83,22 @@
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10
+RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10
 RDATE:20061029T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19880403T020000
-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
diff --git a/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref b/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref
--- a/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref
+++ b/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref
@@ -23,22 +23,22 @@
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10
+RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10
 RDATE:20061029T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19880403T020000
-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
@@ -82,22 +82,22 @@
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10
+RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10
 RDATE:20061029T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19880403T020000
-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
@@ -141,22 +141,22 @@
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10
+RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10
 RDATE:20061029T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19880403T020000
-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
@@ -200,22 +200,22 @@
 TZOFFSETFROM:-0400
 TZOFFSETTO:-0500
 DTSTART:19701025T020000
-RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10
+RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10
 RDATE:20061029T020000
 END:STANDARD
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19760425T020000
-RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
 TZOFFSETFROM:-0500
 TZOFFSETTO:-0400
 DTSTART:19880403T020000
-RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4
+RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4
 END:DAYLIGHT
 BEGIN:DAYLIGHT
 TZNAME:EDT
diff --git a/autotests/data/Compat/AppleICal_1.5.ics.ical.ref b/autotests/data/Compat/AppleICal_1.5.ics.ical.ref
--- a/autotests/data/Compat/AppleICal_1.5.ics.ical.ref
+++ b/autotests/data/Compat/AppleICal_1.5.ics.ical.ref
@@ -17,7 +17,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -68,7 +68,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -119,7 +119,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -170,7 +170,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -221,7 +221,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -272,7 +272,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -323,7 +323,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -374,7 +374,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -425,7 +425,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -476,7 +476,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -527,7 +527,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -578,7 +578,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -629,7 +629,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -680,7 +680,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -731,7 +731,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -782,7 +782,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -833,7 +833,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -884,7 +884,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -935,7 +935,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -986,7 +986,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -1037,7 +1037,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -1088,7 +1088,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -1139,7 +1139,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -1190,7 +1190,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
@@ -1241,7 +1241,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 END:STANDARD
 BEGIN:STANDARD
 TZNAME:CET
diff --git a/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref b/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref
--- a/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref
+++ b/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref
@@ -39,7 +39,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 RDATE;VALUE=DATE-TIME:19950924T030000
 END:STANDARD
 END:VTIMEZONE
@@ -79,7 +79,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 RDATE;VALUE=DATE-TIME:19950924T030000
 END:STANDARD
 END:VTIMEZONE
diff --git a/autotests/data/Compat/Mozilla_1.0.ics.ical.ref b/autotests/data/Compat/Mozilla_1.0.ics.ical.ref
--- a/autotests/data/Compat/Mozilla_1.0.ics.ical.ref
+++ b/autotests/data/Compat/Mozilla_1.0.ics.ical.ref
@@ -38,7 +38,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 RDATE;VALUE=DATE-TIME:19950924T030000
 END:STANDARD
 END:VTIMEZONE
@@ -78,7 +78,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 RDATE;VALUE=DATE-TIME:19950924T030000
 END:STANDARD
 END:VTIMEZONE
@@ -118,7 +118,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 RDATE;VALUE=DATE-TIME:19950924T030000
 END:STANDARD
 END:VTIMEZONE
@@ -158,7 +158,7 @@
 TZOFFSETFROM:+0200
 TZOFFSETTO:+0100
 DTSTART:19790930T030000
-RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9
+RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9
 RDATE;VALUE=DATE-TIME:19950924T030000
 END:STANDARD
 END:VTIMEZONE
diff --git a/autotests/testicaltimezones.cpp b/autotests/testicaltimezones.cpp
--- a/autotests/testicaltimezones.cpp
+++ b/autotests/testicaltimezones.cpp
@@ -123,7 +123,7 @@
       "TZOFFSETFROM:+0200\r\n"
       "TZOFFSETTO:+0100\r\n"
       "DTSTART:19790930T030000\r\n"
-      "RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9\r\n"
+      "RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9\r\n"
       "RDATE;VALUE=DATE-TIME:19950924T030000\r\n"
       "END:STANDARD\r\n"
       "BEGIN:DAYLIGHT\r\n"
diff --git a/src/icaltimezones.cpp b/src/icaltimezones.cpp
--- a/src/icaltimezones.cpp
+++ b/src/icaltimezones.cpp
@@ -386,7 +386,6 @@
                     icalrecurrencetype r;
                     icalrecurrencetype_clear(&r);
                     r.freq = ICAL_YEARLY_RECURRENCE;
-                    r.count = (year >= 2030) ? 0 : times.count() - 1;
                     r.by_month[0] = month;
                     if (rule & DAY_OF_MONTH) {
                         r.by_month_day[0] = dayOfMonth;