Revert "Merge pull request #19809 from mikehenrty/bug-908300-withutils"

This reverts commit f37e71daf1d1dc4b4ed05e711301e145d8b281aa, reversing
changes made to 13d001b8a352312f2015c4e3da933ff6b067bd1d.