SOLR-5859 removing accidental removal of SOLR-5908 changes

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