This reverts commit 7bfd9e068d205f752c05d51778a4a4702329d31e. Conflicts: hadoop-mapreduce-project/CHANGES.txt