SOLR-5623: revert r1564739, shalin already fixed the bug that caused these failures, but Uwe didn't know that