diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
index db2b4f53627..7af2b8f6aa6 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HColumnDescriptor.java
@@ -155,23 +155,6 @@ public class HColumnDescriptor implements ColumnFamilyDescriptor, Comparable<HCo
     this.delegatee = delegate;
   }
 
-  /**
-   * @param b Family name.
-   * @return <code>b</code>
-   * @throws IllegalArgumentException If not null and not a legitimate family
-   * name: i.e. 'printable' and ends in a ':' (Null passes are allowed because
-   * <code>b</code> can be null when deserializing).  Cannot start with a '.'
-   * either. Also Family can not be an empty value or equal "recovered.edits".
-   * @deprecated since 2.0.0 and will be removed in 3.0.0. Use
-   *   {@link ColumnFamilyDescriptorBuilder#isLegalColumnFamilyName(byte[])} instead.
-   * @see ColumnFamilyDescriptorBuilder#isLegalColumnFamilyName(byte[])
-   * @see <a href="https://issues.apache.org/jira/browse/HBASE-18008">HBASE-18008</a>
-   */
-  @Deprecated
-  public static byte [] isLegalFamilyName(final byte [] b) {
-    return ColumnFamilyDescriptorBuilder.isLegalColumnFamilyName(b);
-  }
-
   /**
    * @return Name of this column family
    */
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
index 81e6fd26d26..252f72b8585 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java
@@ -66,6 +66,7 @@ import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HDFSBlocksDistribution;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
 import org.apache.hadoop.hbase.client.RegionInfo;
 import org.apache.hadoop.hbase.client.RegionInfoBuilder;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
@@ -1080,7 +1081,7 @@ public abstract class FSUtils extends CommonFSUtils {
     protected boolean accept(Path p, @CheckForNull Boolean isDir) {
       try {
         // throws IAE if invalid
-        HColumnDescriptor.isLegalFamilyName(Bytes.toBytes(p.getName()));
+        ColumnFamilyDescriptorBuilder.isLegalColumnFamilyName(Bytes.toBytes(p.getName()));
       } catch (IllegalArgumentException iae) {
         // path name is an invalid family name and thus is excluded.
         return false;