Revert HADOOP-9241 from branch-2 as well.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1439772 13f79535-47bb-0310-9956-ffa450edef68