DRILL-414

Same as the patch on https://issues.apache.org/jira/browse/DRILL-414