Revert "Merge pull request #16956 from wilsonpage/bug/979285"