Revert #27878

[damccorm]

This has caused some internal breakages, we should dig in to the changes before releasing them.

PR produced with:

git revert 014a193

Followed by manually resolving conflicts in setup.py and base_image_requirements.txt files. I removed the client change from setup.py and just updated the requirements files to not have any changes.

I also made a separate commit to revert the CHANGES.md update.

---

Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

• Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
• Update CHANGES.md with noteworthy changes.
• If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

[damccorm]

R: @tvalentyn @johnjcasey @BjornPrime

[github-actions]

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control

[codecov]

Codecov Report

Merging #27968 (7088296) into master (761aa7f) will increase coverage by 0.27%.
The diff coverage is 74.91%.

@@            Coverage Diff             @@
##           master   #27968      +/-   ##
==========================================
+ Coverage   72.04%   72.31%   +0.27%     
==========================================
  Files         674      678       +4     
  Lines       98577    99662    +1085     
==========================================
+ Hits        71023    72074    +1051     
- Misses      25991    26025      +34     
  Partials     1563     1563              

Flag	Coverage Δ
python	82.85% <74.91%> (+0.24%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed	Coverage Δ
sdks/python/apache_beam/internal/gcp/auth.py	79.16% <ø> (+0.78%)	⬆️
sdks/python/apache_beam/io/gcp/bigquery_tools.py	74.82% <ø> (ø)
...cp/internal/clients/storage/storage_v1_messages.py	100.00% <ø> (ø)
sdks/python/setup.py	0.00% <ø> (ø)
..._beam/runners/portability/sdk_container_builder.py	37.93% <8.33%> (+1.03%)	⬆️
...apache_beam/runners/dataflow/internal/apiclient.py	75.63% <25.00%> (+0.76%)	⬆️
.../gcp/internal/clients/storage/storage_v1_client.py	65.26% <65.26%> (ø)
sdks/python/apache_beam/io/gcp/gcsio_overrides.py	70.00% <70.00%> (ø)
...e_beam/io/gcp/internal/clients/storage/__init__.py	77.77% <77.77%> (ø)
sdks/python/apache_beam/io/gcp/gcsio.py	92.02% <89.49%> (+26.23%)	⬆️
... and 2 more

... and 9 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more