From 7b690aa8c797ca3fead7821200f1b1b10093bcfc Mon Sep 17 00:00:00 2001
From: Fredrik Roubert <roubert@google.com>
Date: Fri, 19 Jan 2024 08:19:16 +0900
Subject: [PATCH] ICU-22639 Revert now obsolete bug workarounds.

This reverts changes from commit 47b9a517be000559499dcfcb2ed62eace740e194.
This reverts changes from commit 214ae60d9425e5cc78580d0dddf3bbbe4c80e991.
---
 icu4c/source/i18n/calendar.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp
index 33050553488..5ef818b2fbe 100644
--- a/icu4c/source/i18n/calendar.cpp
+++ b/icu4c/source/i18n/calendar.cpp
@@ -3695,16 +3695,14 @@ int32_t Calendar::handleGetExtendedYearFromWeekFields(int32_t yearWoy, int32_t w
 
 int32_t Calendar::handleGetMonthLength(int32_t extendedYear, int32_t month) const
 {
-    const int32_t nextMonthStart = handleComputeMonthStart(extendedYear, month+1, true);
-    const int32_t thisMonthStart = handleComputeMonthStart(extendedYear, month, true);
-    return nextMonthStart - thisMonthStart;
+    return handleComputeMonthStart(extendedYear, month+1, true) -
+        handleComputeMonthStart(extendedYear, month, true);
 }
 
 int32_t Calendar::handleGetYearLength(int32_t eyear) const
 {
-    const int32_t nextYearStart = handleComputeMonthStart(eyear + 1, 0, false);
-    const int32_t thisYearStart = handleComputeMonthStart(eyear, 0, false);
-    return nextYearStart - thisYearStart;
+    return handleComputeMonthStart(eyear+1, 0, false) -
+        handleComputeMonthStart(eyear, 0, false);
 }
 
 int32_t