Revert "Merge pull request #14611 from arroway/bug-797661"

This reverts commit 724d36716bcbbc5cee1af18b94cc328c289d0ccc.