This version of the PR is also missing the changes I requested to this function. Wilson made them, and they are visible here: https://github.com/justindarc/gaia/blob/bug974337/apps/camera/js/controllers/settings.js#L180

Last I heard (on IRC) wilson and justin were trying to figure out why that change didn't get into this patch.  

Please try to track that down since the missing commit may also has other changes based on my review in it.