Comment 2 for bug 835093

I've merged Paul's branch correcting the packaging, but there are several places in the upstream code with the same error.