LUCENE-2926: reverting all changes - it slows down the build. LUCENE-2923 will include these changes for the demo contrib only