I think we should also remove this line (https://github.com/mozilla-b2g/gaia/blob/master/apps/settings/js/settings.js#L867).