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

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