This reverts commit a166833bfa. This caused multiple regressions. Needs to be redone with more testing before merge. Fixes #72501.
a166833bfa