More sane "save new ice" behaviour