SOLR-5978: Undoing previous edit, should be a 4x only change

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