Bug 948857 proposed fix.