Revert 102245

[oli-obk]

reverts #102245, but only on beta, as that caused #109543 which has since been fixed on nightly.

This needed an additional partial revert of 5b08c9f for changes that happened due to later cleanups.

I also added a test from the issue to make sure this actually fixes it 😆

r? @wesleywiser @pnkfelix

[rustbot]

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @wesleywiser (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

• @rustbot author: the review is finished, PR author should check the comments and take action accordingly
• @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

[rustbot]

⚠️ Warning ⚠️

• Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

[rustbot]

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

• Stabilizing library features
• Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
• Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
• Changing public documentation in ways that create new stability guarantees
• Changing observable runtime behavior of library APIs

[rust-log-analyzer]

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[pnkfelix]

@bors r+ p=10

[bors]

📌 Commit 7d89116 has been approved by pnkfelix

It is now in the queue for this repository.

[pnkfelix]

A job failed! Check out the build log: (web) (plain)
Click to see the possible cause of the failure (guessed by this bot)

error: RPC failed; curl 56 GnuTLS recv error (-110): The TLS connection was non-properly terminated.
error: 2004 bytes of body are still expected
fetch-pack: unexpected disconnect while reading sideband packet
fatal: early EOF
fatal: fetch-pack: invalid index-pack output
Error: Process completed with exit code 128.

I'm assuming for now that this is a transient failure that we can ignore and thus have attempted a retry

[bors]

⌛ Testing commit 7d89116 with merge 734f69d...

[bors]

☀️ Test successful - checks-actions
Approved by: pnkfelix
Pushing 734f69d to beta...

[bors]

☀️ Test successful - checks-actions
Approved by: pnkfelix
Pushing 734f69d to beta...