[TSan] Revert r212531 and r212532.