I'm not yet 100% convinced about the "not save defaults" feature and still thinking about it. Could you please move this unrelated change in a separate pull request. Thank you!