Here's an up-to-date removal patch. I also made a (much shorter but non-git apply-able) review patch with git diff -D: SOLR-9221-review.patch.
I've run a few checks with the patch so far: ant resolve, ant idea, ant get-maven-poms, ant check-lib-versions, and ant check-licenses. I'll run ant nightly-smoke shortly - it runs all the validation stuff and unit tests.
If there are no objections (and assuming no problems come up with further testing), I'll commit 2 days from now.