Revert "Merge pull request #9117 from crdlc/859259"

This reverts commit b4d060cae8f06a18d415d440039f4fd40e220d78.