LUCENE-5405: this undoes 1563711, which was the result of a cascade of confusion.


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