Revert "Add necessary changes for kanged theme chooser changes."

This reverts commit 8bca9df6d6d28516c0340b58998917ff90065ac7.