diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
index 7823963c409..512e7a96aa6 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.java
@@ -2388,56 +2388,51 @@ class RawAsyncHBaseAdmin implements AsyncAdmin {
     if (regionNameOrEncodedRegionName == null) {
       return failedFuture(new IllegalArgumentException("Passed region name can't be null"));
     }
-
-    CompletableFuture<Optional<HRegionLocation>> future;
-    if (RegionInfo.isEncodedRegionName(regionNameOrEncodedRegionName)) {
-      String encodedName = Bytes.toString(regionNameOrEncodedRegionName);
-      if (encodedName.length() < RegionInfo.MD5_HEX_LENGTH) {
-        // old format encodedName, should be meta region
-        future = connection.registry.getMetaRegionLocations()
-          .thenApply(locs -> Stream.of(locs.getRegionLocations())
-            .filter(loc -> loc.getRegion().getEncodedName().equals(encodedName)).findFirst());
+    try {
+      CompletableFuture<Optional<HRegionLocation>> future;
+      if (RegionInfo.isEncodedRegionName(regionNameOrEncodedRegionName)) {
+        String encodedName = Bytes.toString(regionNameOrEncodedRegionName);
+        if (encodedName.length() < RegionInfo.MD5_HEX_LENGTH) {
+          // old format encodedName, should be meta region
+          future = connection.registry.getMetaRegionLocations()
+            .thenApply(locs -> Stream.of(locs.getRegionLocations())
+              .filter(loc -> loc.getRegion().getEncodedName().equals(encodedName)).findFirst());
+        } else {
+          future = ClientMetaTableAccessor.getRegionLocationWithEncodedName(metaTable,
+            regionNameOrEncodedRegionName);
+        }
       } else {
-        future = ClientMetaTableAccessor.getRegionLocationWithEncodedName(metaTable,
-          regionNameOrEncodedRegionName);
-      }
-    } else {
-      // Not all regionNameOrEncodedRegionName here is going to be a valid region name,
-      // it needs to throw out IllegalArgumentException in case tableName is passed in.
-      RegionInfo regionInfo;
-      try {
-        regionInfo = CatalogFamilyFormat.parseRegionInfoFromRegionName(
-          regionNameOrEncodedRegionName);
-      } catch (IOException ioe) {
-        throw new IllegalArgumentException(ioe.getMessage());
+        RegionInfo regionInfo =
+          CatalogFamilyFormat.parseRegionInfoFromRegionName(regionNameOrEncodedRegionName);
+        if (regionInfo.isMetaRegion()) {
+          future = connection.registry.getMetaRegionLocations()
+            .thenApply(locs -> Stream.of(locs.getRegionLocations())
+              .filter(loc -> loc.getRegion().getReplicaId() == regionInfo.getReplicaId())
+              .findFirst());
+        } else {
+          future =
+            ClientMetaTableAccessor.getRegionLocation(metaTable, regionNameOrEncodedRegionName);
+        }
       }
 
-      if (regionInfo.isMetaRegion()) {
-        future = connection.registry.getMetaRegionLocations()
-          .thenApply(locs -> Stream.of(locs.getRegionLocations())
-            .filter(loc -> loc.getRegion().getReplicaId() == regionInfo.getReplicaId())
-            .findFirst());
-      } else {
-        future =
-          ClientMetaTableAccessor.getRegionLocation(metaTable, regionNameOrEncodedRegionName);
-      }
+      CompletableFuture<HRegionLocation> returnedFuture = new CompletableFuture<>();
+      addListener(future, (location, err) -> {
+        if (err != null) {
+          returnedFuture.completeExceptionally(err);
+          return;
+        }
+        if (!location.isPresent() || location.get().getRegion() == null) {
+          returnedFuture.completeExceptionally(
+            new UnknownRegionException("Invalid region name or encoded region name: " +
+              Bytes.toStringBinary(regionNameOrEncodedRegionName)));
+        } else {
+          returnedFuture.complete(location.get());
+        }
+      });
+      return returnedFuture;
+    } catch (IOException e) {
+      return failedFuture(e);
     }
-
-    CompletableFuture<HRegionLocation> returnedFuture = new CompletableFuture<>();
-    addListener(future, (location, err) -> {
-      if (err != null) {
-        returnedFuture.completeExceptionally(err);
-        return;
-      }
-      if (!location.isPresent() || location.get().getRegion() == null) {
-        returnedFuture.completeExceptionally(
-          new UnknownRegionException("Invalid region name or encoded region name: " +
-            Bytes.toStringBinary(regionNameOrEncodedRegionName)));
-      } else {
-        returnedFuture.complete(location.get());
-      }
-    });
-    return returnedFuture;
   }
 
   /**
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionInfo.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionInfo.java
index b6bdd0103de..d7460e9d15e 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionInfo.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionInfo.java
@@ -363,23 +363,7 @@ public interface RegionInfo extends Comparable<RegionInfo> {
   @InterfaceAudience.Private // For use by internals only.
   public static boolean isEncodedRegionName(byte[] regionName) {
     // If not parseable as region name, presume encoded. TODO: add stringency; e.g. if hex.
-    if (parseRegionNameOrReturnNull(regionName) == null) {
-      if (regionName.length > MD5_HEX_LENGTH) {
-        return false;
-      } else if (regionName.length == MD5_HEX_LENGTH) {
-        return true;
-      } else {
-        String encodedName = Bytes.toString(regionName);
-        try {
-          Integer.parseInt(encodedName);
-          // If this is a valid integer, it could be hbase:meta's encoded region name.
-          return true;
-        } catch(NumberFormatException er) {
-          return false;
-        }
-      }
-    }
-    return false;
+    return parseRegionNameOrReturnNull(regionName) == null && regionName.length <= MD5_HEX_LENGTH;
   }
 
   /**
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
index cfd61d295f8..a0ed836f9c7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java
@@ -99,25 +99,6 @@ public class TestAdmin1 extends TestAdminBase {
     assertTrue(exception instanceof TableNotFoundException);
   }
 
-  @Test
-  public void testCompactATableWithSuperLongTableName() throws Exception {
-    TableName tableName = TableName.valueOf(name.getMethodName());
-    TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName)
-      .setColumnFamily(ColumnFamilyDescriptorBuilder.of("fam1")).build();
-    try {
-      ADMIN.createTable(htd);
-      try {
-        ADMIN.majorCompactRegion(tableName.getName());
-        ADMIN.majorCompactRegion(Bytes.toBytes("abcd"));
-      } catch (IllegalArgumentException iae) {
-        LOG.info("This is expected");
-      }
-    } finally {
-      ADMIN.disableTable(tableName);
-      ADMIN.deleteTable(tableName);
-    }
-  }
-
   @Test
   public void testCompactionTimestamps() throws Exception {
     TableName tableName = TableName.valueOf(name.getMethodName());