This reverts commit 3ad3cfd7e2de42aaaf8ba0af258ef21a064027bc. Closes gh-14137
See gh-13830
Closes gh-13830