diff --git a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesFetcher.java b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesFetcher.java index fdac89eec7a4e..9a44a188b85b7 100644 --- a/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesFetcher.java +++ b/server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesFetcher.java @@ -117,11 +117,7 @@ static Map retrieveFieldCaps( if (filter.test(ft)) { IndexFieldCapabilities fieldCap = new IndexFieldCapabilities( field, - // This is a nasty hack so that we expose aggregate_metric_double field, - // when the index is a time series index and the field is marked as metric. - // This code should be reverted once PR https://github.com/elastic/elasticsearch/pull/87849 - // is merged. - isTimeSeriesIndex && ft.getMetricType() != null ? ft.typeName() : ft.familyTypeName(), + ft.familyTypeName(), context.isMetadataField(field), ft.isSearchable(), ft.isAggregatable(),