b50692fc67
This reverts commit a3099606cb.
This doesn't work because the UI then starts showing the default icon
initially (since the icon gets download on the box after sometime)
and never gets around to updating it.