That variety of timeout is not of the "persistent" kind though, that's a different issue that will be dealt with separately.
Related to #4465.
Note that I've checked once again that this change makes absolutely no visible difference on Windows (i.e. with or without acquiring the db first, I can't trigger a timeout to happen).
