Revert "Merge pull request #14033 from KevinGrandon/reland_bug_936201"

This reverts commit 8245888f1ac0d27cebbcb48dfdb7e75d89586b00, reversing
changes made to 2dd4c604c1a17e82f2a7e90d7838dab1516c6dde.