Revert "Merge pull request #24354 from nullaus/bug1064975"

This reverts commit a4c14a9a385af9957c0958667405d186e0c87a66, reversing
changes made to 9e28b533bc4f66bb8c440baacd7d807c50fee646.