This reverts commit 97056c3355810a803f07baca89b89e2bf6bb7201. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt