This reverts commit 5d993eeb84. The revert didn't seem to fix the problem (#99236) and the errors look the same (tried several times).
5d993eeb84