This reverts commits c96ee0ffaf and 9ceb967667. Discussion in github PR #108658.
c96ee0ffaf
9ceb967667