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