This reverts commit a66051c6. This seems to have caused issue #70509 so reverting until I have time to investigate.