Backporting the portions I need to Pre-ARC/MRR.