This reverts commit 51af8d367de94689770f57c64bea3b244d7755f6. Conflicts: hadoop-yarn-project/CHANGES.txt (cherry picked from commit a4f2995b9ec8347612b7aeeb5a3a8b7191278790)