LUCENE-5920: Revert previous commits (but leave the else attributes)

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