Bug 1040181 - Use an opaque wrapper rather than failing in Rewrap. r=gabor