Merged revision(s) 1585536 from lucene/dev/trunk:
Revert previous commit, this is a bug in JDK 1.8.0_20 EA.

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