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