Reverting an old optimization that conflicts with the new allocator model, and causes some test casees to compile that shouldn't.

llvm-svn: 122830