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