dfebd6d9d4
This reverts commit e6c268add0.
Issue gh-9610 gh-9858
Closes gh-10018
Closes gh-10121
This reverts commit e6c268add0.
Issue gh-9610 gh-9858
Closes gh-10018
Closes gh-10121