Reverting HADOOP-9241. To be fixed and reviewed.

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