Comment 13 for bug 836915

I'm inclined to say go ahead with this at this point. Despite the problems, it seems a lot more likely to work well than trying to bodge together something that works out of the existing versions in the archive.