Sorry hear you have it too, but also glad not just me and one other person.
What I have learned recently that seems to work. Got back and once you get the '7 Hour' achievement, I'm not sure which worked cause I did both to be sure. Is you go into Settings and hit Apply, after die so you get kicked back to the Starting Menu. I drowned which didn't take too long and that seemed to save the Achievement for me, so it might work for you too. Hope this helps as a Temp fix.