Revert "Merge pull request #16262 from benfrancis/959694-master"
Merge pull request #17995 from sfoster/backout-959694

Revert "Merge pull request #16262 from benfrancis/959694-master"