Revert "Merge pull request #10983 from gaye/bug-889396"

This reverts commit d19a13c8a54411bba0a80c6a23d1b6cda9deb93f.