CB-4620: Throwing this over the fence, since there is a problem actually in the wild here