Revert PR 19790 (breaks windowsTP4 CI on cache bust) Upstream-commit: 5f5a752bcf687aab0120e6c7903922ff01371ec0 Component: engine
Revert PR 19790 (breaks windowsTP4 CI on cache bust) Upstream-commit: 5f5a752bcf687aab0120e6c7903922ff01371ec0 Component: engine