Revert "Merge pull request #11606 from lodr/bug-896848-missing-icchelper"

This reverts commit 6798a7fd8fbc6f154a38e3971ed278d0a05dfb40.