Revert "Merge pull request #13486 from KevinGrandon/settings_desktop_shims"

This reverts commit 91ecaba0e827a3c42c2553b8f308b726707fbdf9, reversing
changes made to 87b955d576b7422befadb85208f9a612153c4d08.