Style switcher issue fixed
Revert "Style switcher issue fixed"

This reverts commit 418ed1593958e5ffc5fdee39e35e4cabb8021621.