Likely fix for bug 2708.