Revert "Merge pull request #24910 from davidflanagan/bug1063658"

This reverts commit b46e28a4d9d042452b2f1fe07a191317caccc6fa, reversing
changes made to 9903497debc38227a158e4719871f1ac73691113.