re-apply r1567231, which seems to have been inadvertantly reverted in r1568340 as part of SOLR-3854

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1568689 13f79535-47bb-0310-9956-ffa450edef68