Revert "Merge pull request #12550 from zacc/bug922062"

This reverts commit caa78c37ea089a39ee3ebadd2dc2677069ccaaac, reversing
changes made to 433971682d023414a6ab2b6103708d1968ef0b0e.