Revert "Merge pull request #19278 from ranjithgithub/1000701_FileNameDon...

...eIconSupport"

This reverts commit 696257a7a60e0d87c25e23611f2a6aaf9a3cb86b, reversing
changes made to 10e4bc8a1760bfb66d1e63c881ce4b7f0d1b9755.