This reverts commit acc172e3718e23ff6808ddcc01543212f1334a27. Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt