Backout 3f395d9d894a (Bug 1057563) for not handling the background allocation case.