revert r1469573 - unintentionally committed too much

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