Revert #76246 and #76083

These cause test build failures on Windows.

This reverts the following commits:
  57ca74843586c9a93c425036c5538aae0a2cfa60
  d06ae33ec32122bb526fb35025c1f0cf979f1090

GitOrigin-RevId: 5c150e7eeba9db13cc65b329b3c3537b613ae61d
35 files changed