Trying out patch for HADOOP-9299