Revert "Merge pull request #15857 from comoyo/bug964216"

This reverts commit d8bdd6e84ccbb9027f811e42373cbdd53977980a, reversing
changes made to bcecb91f5ef7b0d9e426dbda489baee424eed93c.