Revert "Merge pull request #15996 from dmarcos/bug958200"

This reverts commit e1c8b80d893550b8cadf6ea77ea5471b6fef03e1, reversing
changes made to 60b7367e34ae791140cdfeeca0de113ca94a887d.