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