Revert "Merge pull request #17997 from mikehenrty/bug-988737-clear"

This reverts commit 32af2759f67252fa490d1f36f912b73a33481965.