Merge "Revert "Give up on busy DB after a while"" into main