Reverting r1614132 (HDFS-6717) from branch-2.5, as it is partial

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1616283 13f79535-47bb-0310-9956-ffa450edef68