Revert "Merge pull request #18249 from davidflanagan/bug995432"

This reverts commit 9021261929e5c07c3d7d5a794d572526fb3fa577.