Revert "Merge pull request #20674 from nullaus/bug1021857"

This reverts commit 9b324279fb2225154a50748cb83aa925de4fd11e.