partial revert of [mr2729].

For next time:
Make better function name, then this mistakes with SpellIconID doesn't appear.