Revert "CM11 Themes: Don't kill setup wizards"

This reverts commit 97d10d68ea60452fe6a290e3eed6a496b1237564.