Revert "Fix Profile Settings From Last Commit"

This reverts commit 33b9cea43a7de7a55f7a190928c7b4d55a09be33.
Revert "Settings: Forward port missing Profiles related changes"

This reverts commit 0ae1b1ce64bb21734cd0f6d8f3c94de949194ff7.