Revert #18271 and #18318. (#18513)
Reverts PR
Reverts #18271 and #18318.
Issues fixed
Fixes #18498.
Issues reopened
Reopens #15159. Reopens #11285.
Reason for revert
Causes regression #18498.
Can this PR be reimplemented? If so, what is required for the next attempt
Unknown.
