Fixed #18824 -- Allow deleting a setting from overriden settings