Revert "Merge pull request #19504 from justindarc/bug1008349"

This reverts commit c16d56833586c34be586aee357f860b890039a3d, reversing
changes made to 43d26d9f869d62616b217b8c68b21d02e1a8da5b.