YAHOO-205 -- QE improvement from https://issues.apache.org/jira/browse/HADOOP-9233 comments