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