Rolling out r187463, because it caused memory corruption on multiple tests.