Backout fix for SOLR-6631 as things like create collection are hanging now

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