Trying Vinod's patch for MAPREDUCE-5240