remove workaround for nested PreferenceScreen's

Closes #2208
//FREEBIE