I feel your pain. I now keep my data backup separate to the OS backups, so a rollback might time travel me back 3 years, but my data’s safe… elsewhere… (Sure. I might still have to do a restore…)