HDFS-5932: revert change in DFSClient