Put the save() code in one place as well, although I'm unsatisfied wi…

Put the save() code in one place as well, although I'm unsatisfied wi… #4974