Revert "Merge pull request #25887 from snowmantw/bug1094829"

This reverts commit a36f52d2398e7b97a32b52dbe258a0a65a1ba98a, reversing
changes made to 89a863f05800e143bdabbeb3859f9fbc20cb3040.