Another place where I don't think save is needed anymore. But check with @dmitchell.