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

This reverts commit ab895af6425ed0100afa1d3d9871126e3f4552df, reversing
changes made to c7645dcdda43239164469e46ab52335b24c7b717.