Regen the pre-built unicore files
Bring back the patch to stop rebuilding unicore every time

I meant to have these merged all pretty, but forgot before I pushed.