LUCENE-6666: reverting this from trunk as the code doesn't use a separate thread killer thread (thanks Uwe).