Revert "Prebuild updates" (so it can work with 2.8.10 again)

This reverts commit 7d867d8d5b07e03a6a59ee362183f70bd80bbfe2.

Conflicts:
	prebuild.xml