Partial revert of r1479766 (http://svn.apache.org/viewvc?view=revision&revision=1479766, merged from r1484146).

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