e6cdf770ca
This reverts commit eda4ac07c1835031aca7e27cc673f1c5913813bb. Commit eda4ac07c1835031aca7e27cc673f1c5913813bb was a separate patch from trunk rather than a cherry-pick. I will cherryp-ick dependencies and then cherry-pick the trunk commit for YARN-2113.