Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG""