under modifying for HADOOP-9772