Revert "Merge pull request #17164 from mcjimenez/bug978785"

This reverts commit 73c3a1305da4a949c1634a009c400bc2431848d2, reversing
changes made to 9f4de77d34987e5e10fdc1abe374937b953af70d.