LUCENE-5283: Fixup to prevent permgens, removed leftover junk (thx Uwe).

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