I still need to test this, but I'll wait until some other builds on my laptop have finished first, to avoid OOM-ing.