Revert "Merge pull request #14148 from caseyyee/bug-929361"

This reverts commit 215febd4fcfda2f417b17437bf884459340cbf6f, reversing
changes made to 69ce560b82cc65078246d168e0ca4efb09888000.