Revert "Merge pull request #16347 from steveck-chung/bug-972245"

This reverts commit 7b37543888457b6cdf8cb8dc766bcd6fd3ba383f, reversing
changes made to 98b095fd4ea10ae180bf00925135be0a15b2c7b8.