Re-fix (internal) HADOOP-2240