Revert "Merge pull request #7841 from crdlc/bug-835710"