This reverts the main code changes from commit
b240c810a8. The tests are kept to
verify that the workaround is no longer required.
Closes gh-18591
This reverts the main code changes from commit
b240c810a8. The tests are kept to
verify that the workaround is no longer required.
Closes gh-18591