Reverting 1512475 (labeled as YARN-656). Accidentally committed two patches together

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1512478 13f79535-47bb-0310-9956-ffa450edef68