I am reverting HDFS-14476 from trunk, branch-3.2, branch-3.1, branch-2, branch-2.9, branch-2.8.
This commit caused test failures as reported in HDFS-14751 <https://issues.apache.org/jira/browse/HDFS-14751> by Lisheng Sun. Sorry for the inconvenience.
