This reverts commit 2b252844e04eebd4f32815d4bd6f914c02994709. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt