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