Comment 12 for bug 950160

I formed another patch and had it in the upstream bug for review.