Revert "Merge pull request #12947 from davidflanagan/bug884752-v1.2"

This reverts commit 8cbe9e4fe267f010bfa1e6a96837b600492d020c, reversing
changes made to 22b95ba3a4df0c2e69ac19a7300cb9d43085a860.