diff --git a/lucene/core/src/java/org/apache/lucene/util/MSBRadixSorter.java b/lucene/core/src/java/org/apache/lucene/util/MSBRadixSorter.java
index 70948d3c30ba..f471a3f53fc4 100644
--- a/lucene/core/src/java/org/apache/lucene/util/MSBRadixSorter.java
+++ b/lucene/core/src/java/org/apache/lucene/util/MSBRadixSorter.java
@@ -213,16 +213,7 @@ protected int getBucket(int i, int k) {
    *
    * @see #buildHistogram
    */
-  // This method, and its namesakes, have been manually split to work around a JVM crash.
-  // See https://github.com/apache/lucene/issues/12898
   private int computeCommonPrefixLengthAndBuildHistogram(int from, int to, int k, int[] histogram) {
-    int commonPrefixLength = computeInitialCommonPrefixLength(from, k);
-    return computeCommonPrefixLengthAndBuildHistogramPart1(
-        from, to, k, histogram, commonPrefixLength);
-  }
-
-  // This method, and its namesakes, have been manually split to work around a JVM crash.
-  private int computeInitialCommonPrefixLength(int from, int k) {
     final int[] commonPrefix = this.commonPrefix;
     int commonPrefixLength = Math.min(commonPrefix.length, maxLength - k);
     for (int j = 0; j < commonPrefixLength; ++j) {
@@ -233,13 +224,7 @@ private int computeInitialCommonPrefixLength(int from, int k) {
         break;
       }
     }
-    return commonPrefixLength;
-  }
 
-  // This method, and its namesakes, have been manually split to work around a JVM crash.
-  private int computeCommonPrefixLengthAndBuildHistogramPart1(
-      int from, int to, int k, int[] histogram, int commonPrefixLength) {
-    final int[] commonPrefix = this.commonPrefix;
     int i;
     outer:
     for (i = from + 1; i < to; ++i) {
@@ -254,13 +239,7 @@ private int computeCommonPrefixLengthAndBuildHistogramPart1(
         }
       }
     }
-    return computeCommonPrefixLengthAndBuildHistogramPart2(
-        from, to, k, histogram, commonPrefixLength, i);
-  }
 
-  // This method, and its namesakes, have been manually split to work around a JVM crash.
-  private int computeCommonPrefixLengthAndBuildHistogramPart2(
-      int from, int to, int k, int[] histogram, int commonPrefixLength, int i) {
     if (i < to) {
       // the loop got broken because there is no common prefix
       assert commonPrefixLength == 0;
diff --git a/lucene/core/src/java/org/apache/lucene/util/RadixSelector.java b/lucene/core/src/java/org/apache/lucene/util/RadixSelector.java
index 47c3ca6eaf12..6a916ed8f853 100644
--- a/lucene/core/src/java/org/apache/lucene/util/RadixSelector.java
+++ b/lucene/core/src/java/org/apache/lucene/util/RadixSelector.java
@@ -198,16 +198,7 @@ private int getBucket(int i, int k) {
    *
    * @see #buildHistogram
    */
-  // This method, and its namesakes, have been manually split to work around a JVM crash.
-  // See https://github.com/apache/lucene/issues/12898
   private int computeCommonPrefixLengthAndBuildHistogram(int from, int to, int k, int[] histogram) {
-    int commonPrefixLength = computeInitialCommonPrefixLength(from, k);
-    return computeCommonPrefixLengthAndBuildHistogramPart1(
-        from, to, k, histogram, commonPrefixLength);
-  }
-
-  // This method, and its namesakes, have been manually split to work around a JVM crash.
-  private int computeInitialCommonPrefixLength(int from, int k) {
     final int[] commonPrefix = this.commonPrefix;
     int commonPrefixLength = Math.min(commonPrefix.length, maxLength - k);
     for (int j = 0; j < commonPrefixLength; ++j) {
@@ -218,13 +209,7 @@ private int computeInitialCommonPrefixLength(int from, int k) {
         break;
       }
     }
-    return commonPrefixLength;
-  }
 
-  // This method, and its namesakes, have been manually split to work around a JVM crash.
-  private int computeCommonPrefixLengthAndBuildHistogramPart1(
-      int from, int to, int k, int[] histogram, int commonPrefixLength) {
-    final int[] commonPrefix = this.commonPrefix;
     int i;
     outer:
     for (i = from + 1; i < to; ++i) {
@@ -241,13 +226,7 @@ private int computeCommonPrefixLengthAndBuildHistogramPart1(
         }
       }
     }
-    return computeCommonPrefixLengthAndBuildHistogramPart2(
-        from, to, k, histogram, commonPrefixLength, i);
-  }
 
-  // This method, and its namesakes, have been manually split to work around a JVM crash.
-  private int computeCommonPrefixLengthAndBuildHistogramPart2(
-      int from, int to, int k, int[] histogram, int commonPrefixLength, int i) {
     if (i < to) {
       // the loop got broken because there is no common prefix
       assert commonPrefixLength == 0;