Revert "Merge pull request #16640 from changm/bug970284"

This reverts commit ec159aac19ff25912f1d68ffb44b29f797583ef5, reversing
changes made to 5534725dbc8245070cd8c40bd4150cfaef306474.