Upgrade from 3.2.0.beta3-dev to 3.2.0.beta3 failed due to out of memory

Looks good to me! Obviously 30m+ rebuilds are still not ideal, so I hope we can improve things in the not-too-distant future. But this seems like a good solution to stop the bleeding.