Reapply r91459, it was only unmasking the bug, and since TOT is still broken having it reverted does no good.

llvm-svn: 91559