* commit 'ddd4a9b9c329274d56a72d84f11dc0148215c406': Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"