This reverts commits185b1a5bd3and19ad31b89f. The original PR and its fixup still had regressions, so we're going back to the drawing board to reattempt fixing #43749. Fixes #64785. Fixes #64851. Fixes #64866.
This reverts commits185b1a5bd3and19ad31b89f. The original PR and its fixup still had regressions, so we're going back to the drawing board to reattempt fixing #43749. Fixes #64785. Fixes #64851. Fixes #64866.