diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 8a2e71e6fb..d5730d5b92 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1416,6 +1416,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
         return getTokenMetadata().getHostId(FBUtilities.getBroadcastAddress()).toString();
     }
 
+    public Map<String, String> getHostIdMap()
+    {
+        return getEndpointToHostId();
+    }
+
     public Map<String, String> getEndpointToHostId()
     {
         Map<String, String> mapOut = new HashMap<>();
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index 7e74947438..b8582a3b16 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -158,6 +158,10 @@ public interface StorageServiceMBean extends NotificationEmitter
     /** Retrieve this hosts unique ID */
     public String getLocalHostId();
 
+    /** {@link StorageServiceMBean#getEndpointToHostId} */
+    @Deprecated
+    public Map<String, String> getHostIdMap();
+
     /** Retrieve the mapping of endpoint to host ID */
     public Map<String, String> getEndpointToHostId();