Restore local_settings support