This reverts commit bb3b315eee8a669bf78940a24ecc4279cd04d380. Reason for Revert: Issues with Google3 TAP Failures PR Close #40533
This reverts commit bb3b315eee8a669bf78940a24ecc4279cd04d380. Reason for Revert: Issues with Google3 TAP Failures PR Close #40533