Revert "Merge pull request #13401 from crdlc/bug-935087"

This reverts commit 2c61fbabc936f1477e3b5649e400af8d52ea8bcc, reversing
changes made to 2a0abada8aa45a1f1c09381a148fe448930f55f6.