This reverts commit 8fbea531d7f7b665f6f55af54c8ebf330118ff37. Conflicts: hadoop-yarn-project/CHANGES.txt