[TSan] Revert r212531 and r212532.

They cause "check-tsan" command to hang. Details in r212532 review thread.