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