Failed to bootstrap due to out of memory killer

[Osama]

FYI I’ve just merged that change again but this time it should not break bootstrap. Please let me know if this causes any problems.