This reverts r362355 (git commit c78c999a) This causes some internal tests to fail; details provided offthread. llvm-svn: 362755