Second part of the fix for bug 6828 - infinite timeout occurs when byte lock held...